[1.19.x] Apply general renames, A SRG is provided for modders. (#8840)

See https://gist.github.com/SizableShrimp/882a671ff74256d150776da08c89ef72
This commit is contained in:
SizableShrimp authored and GitHub committed 2022-07-11 18:27:48 -07:00
1 parent 5e8c786406
commit b8b40e1f54
140 files changed
+1138 -1149

No files matched your search

@@ -14,7 +14,7 @@ import net.minecraftforge.event.AddPackFindersEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.resource.PathResourcePack;
import net.minecraftforge.resource.PathPackResources;
import java.io.IOException;
@@ -32,7 +32,7 @@ public class AddPackFinderEventTest
if (event.getPackType() == PackType.CLIENT_RESOURCES)
{
var resourcePath = ModList.get().getModFileById(MODID).getFile().findResource("test_nested_resource_pack");
var pack = new PathResourcePack(ModList.get().getModFileById(MODID).getFile().getFileName() + ":" + resourcePath, resourcePath);
var pack = new PathPackResources(ModList.get().getModFileById(MODID).getFile().getFileName() + ":" + resourcePath, resourcePath);
var metadataSection = pack.getMetadataSection(PackMetadataSection.SERIALIZER);
if (metadataSection != null)
{
@@ -39,6 +39,7 @@ import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.ButtonBlock;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.PressurePlateBlock;
import net.minecraft.world.level.block.StandingSignBlock;
import net.minecraft.world.level.block.WallSignBlock;
@@ -46,7 +47,7 @@ import net.minecraftforge.common.crafting.CompoundIngredient;
import net.minecraftforge.common.crafting.PartialNBTIngredient;
import net.minecraftforge.common.crafting.DifferenceIngredient;
import net.minecraftforge.common.crafting.IntersectionIngredient;
import net.minecraftforge.common.crafting.NBTIngredient;
import net.minecraftforge.common.crafting.StrictNBTIngredient;
import net.minecraftforge.common.data.SoundDefinition;
import net.minecraftforge.common.data.SoundDefinitionsProvider;
import net.minecraftforge.registries.ForgeRegistries;
@@ -54,7 +55,6 @@ import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.jline.utils.InputStreamReader;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
@@ -76,7 +76,6 @@ 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.HashCache;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder;
@@ -105,13 +104,11 @@ 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.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.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;
@@ -119,7 +116,6 @@ 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)
@@ -262,7 +258,7 @@ public class DataGeneratorTest
// ingredient tests
// strict NBT match - should match an unnamed iron pickaxe that lost 3 durability
Ingredient nbtIngredient = NBTIngredient.of(Util.make(() ->
Ingredient nbtIngredient = StrictNBTIngredient.of(Util.make(() ->
{
ItemStack stack = new ItemStack(Items.IRON_PICKAXE);
stack.setDamageValue(3);
@@ -33,7 +33,7 @@ import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -5,7 +5,6 @@
package net.minecraftforge.debug;
import net.minecraft.Util;
import net.minecraft.core.NonNullList;
import net.minecraft.network.chat.Component;
import net.minecraft.world.effect.MobEffect;
@@ -116,7 +115,7 @@ public class ManyMobEffectsTest
{
if (!event.getTarget().getLevel().isClientSide() && event.getTarget() instanceof MushroomCow cow)
{
var heldItem = event.getPlayer().getItemInHand(event.getHand());
var heldItem = event.getEntity().getItemInHand(event.getHand());
if (heldItem.is(Items.POTION))
{
var effects = PotionUtils.getMobEffects(heldItem);
@@ -131,7 +130,7 @@ public class ManyMobEffectsTest
var effect = ((MobEffect) ObfuscationReflectionHelper.getPrivateValue(MushroomCow.class, cow, "f_289" + "09_"));
if (effect != null)
{
event.getPlayer().sendSystemMessage(Component.literal(String.valueOf(ForgeRegistries.MOB_EFFECTS.getKey(effect))));
event.getEntity().sendSystemMessage(Component.literal(String.valueOf(ForgeRegistries.MOB_EFFECTS.getKey(effect))));
}
}
}
@@ -12,7 +12,7 @@ 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.event.entity.living.MobEffectEvent;
import net.minecraftforge.eventbus.api.Event.Result;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -29,40 +29,40 @@ public class PotionEventTest
{
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onSetup);
}
private void onSetup(FMLCommonSetupEvent event)
{
BrewingRecipeRegistry.addRecipe(Ingredient.of(Items.ICE), Ingredient.of(Items.LAVA_BUCKET), new ItemStack(Items.OBSIDIAN));
}
@SubscribeEvent
public static void onPotionAdded(PotionEvent.PotionAddedEvent event)
public static void onPotionAdded(MobEffectEvent.Added event)
{
if (!event.getEntity().getCommandSenderWorld().isClientSide)
LOGGER.info("{} has a new PotionEffect {} from {}, the old one was {}", event.getEntityLiving(), event.getPotionEffect(), event.getPotionSource(), event.getOldPotionEffect());
LOGGER.info("{} has a new PotionEffect {} from {}, the old one was {}", event.getEntity(), event.getEffectInstance(), event.getEffectSource(), event.getOldEffectInstance());
}
@SubscribeEvent
public static void isPotionApplicable(PotionEvent.PotionApplicableEvent event)
public static void isPotionApplicable(MobEffectEvent.Applicable event)
{
if (!event.getEntity().getCommandSenderWorld().isClientSide)
{
event.setResult(Result.ALLOW);
LOGGER.info("Allowed Potion {} for Entity {}", event.getPotionEffect(), event.getEntityLiving());
LOGGER.info("Allowed Potion {} for Entity {}", event.getEffectInstance(), event.getEntity());
}
}
@SubscribeEvent
public static void onPotionRemove(PotionEvent.PotionRemoveEvent event)
public static void onPotionRemove(MobEffectEvent.Remove event)
{
if (!event.getEntity().getCommandSenderWorld().isClientSide)
LOGGER.info("Effect {} got Removed from {}", event.getPotionEffect(), event.getEntityLiving());
LOGGER.info("Effect {} got Removed from {}", event.getEffectInstance(), event.getEntity());
}
@SubscribeEvent
public static void onPotionExpiry(PotionEvent.PotionExpiryEvent event)
public static void onPotionExpiry(MobEffectEvent.Expired event)
{
if (!event.getEntity().getCommandSenderWorld().isClientSide)
LOGGER.info("Effect {} expired from {}", event.getPotionEffect(), event.getEntityLiving());
LOGGER.info("Effect {} expired from {}", event.getEffectInstance(), event.getEntity());
}
}
@@ -16,7 +16,7 @@ import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.ForgeRegistries;
@Mod(RemoveTagDatagenTest.MODID)
@@ -24,18 +24,18 @@ public class RemoveTagDatagenTest
{
public static final String MODID = "remove_tag_datagen_test";
public static final TagKey<Block> TEST_TAG = BlockTags.create(new ResourceLocation("test_tag"));
public RemoveTagDatagenTest()
{
IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
modBus.addListener(this::onGatherData);
}
private void onGatherData(GatherDataEvent event)
{
DataGenerator generator = event.getGenerator();
ExistingFileHelper helper = event.getExistingFileHelper();
generator.addProvider(true, new BlockTagsProvider(generator, MODID, helper)
{
@SuppressWarnings("unchecked")
@@ -6,7 +6,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.world.entity.item.FallingBlockEntity;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -38,7 +38,7 @@ public class BlockEntityOnLoadTest
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, "be_onload_test");
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "be_onload_test");
private static final DeferredRegister<BlockEntityType<?>> BE_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, "be_onload_test");
private static final DeferredRegister<BlockEntityType<?>> BE_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, "be_onload_test");
private static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("be_onload_testblock", () -> new TestBlock(Properties.of(Material.DECORATION, MaterialColor.SAND)));
private static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register("be_onload_testblock", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
@@ -54,7 +54,7 @@ public class CustomHeadTest
static final String MODID = "custom_head_test";
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 DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MODID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
private static final RegistryObject<Block> BLAZE_HEAD = BLOCKS.register("blaze_head", () -> new CustomSkullBlock(SkullType.BLAZE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0F)));
private static final RegistryObject<Block> BLAZE_HEAD_WALL = BLOCKS.register("blaze_wall_head", () -> new CustomWallSkullBlock(SkullType.BLAZE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0F).lootFrom(BLAZE_HEAD)));
private static final RegistryObject<Item> BLAZE_HEAD_ITEM = ITEMS.register("blaze_head", () -> new StandingAndWallBlockItem(BLAZE_HEAD.get(), BLAZE_HEAD_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS).rarity(Rarity.UNCOMMON)));
@@ -49,7 +49,7 @@ public class CustomSignsTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static final RegistryObject<SignItem> TEST_SIGN = ITEMS.register("test_sign", () -> new SignItem((new Item.Properties()).stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), TEST_STANDING_SIGN.get(), TEST_WALL_SIGN.get()));
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MODID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
public static final RegistryObject<BlockEntityType<CustomSignBlockEntity>> CUSTOM_SIGN = BLOCK_ENTITIES.register("custom_sign", () -> BlockEntityType.Builder.of(CustomSignBlockEntity::new, TEST_WALL_SIGN.get(), TEST_STANDING_SIGN.get()).build(null));
public CustomSignsTest()
@@ -5,7 +5,7 @@
package net.minecraftforge.debug.block;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.event.level.BlockEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -67,7 +67,7 @@ public class FullPotsAccessorDemo
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MOD_ID);
private static final RegistryObject<Block> DIORITE_POT = BLOCKS.register("diorite_pot", DioriteFlowerPotBlock::new);
private static final RegistryObject<Item> DIORITE_POT_ITEM = ITEMS.register(
@@ -6,7 +6,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent;
import net.minecraftforge.event.level.BlockEvent.NeighborNotifyEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -28,14 +28,14 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.world.PistonEvent;
import net.minecraftforge.event.world.PistonEvent.PistonMoveType;
import net.minecraftforge.event.level.PistonEvent;
import net.minecraftforge.event.level.PistonEvent.PistonMoveType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -73,7 +73,7 @@ public class PistonEventTest
{
if (event.getPistonMoveType() == PistonMoveType.EXTEND)
{
Level world = (Level) event.getWorld();
Level world = (Level) event.getLevel();
PistonStructureResolver pistonHelper = event.getStructureHelper();
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (world.isClientSide && player != null)
@@ -93,7 +93,7 @@ public class PistonEventTest
List<BlockPos> posList = pistonHelper.getToPush();
for (BlockPos newPos : posList)
{
BlockState state = event.getWorld().getBlockState(newPos);
BlockState state = event.getLevel().getBlockState(newPos);
if (state.getBlock() == Blocks.BLACK_WOOL)
{
Block.dropResources(state, world, newPos);
@@ -111,20 +111,20 @@ public class PistonEventTest
}
// Block pushing cobblestone (directly, indirectly works)
event.setCanceled(event.getWorld().getBlockState(event.getFaceOffsetPos()).getBlock() == Blocks.COBBLESTONE);
event.setCanceled(event.getLevel().getBlockState(event.getFaceOffsetPos()).getBlock() == Blocks.COBBLESTONE);
}
else
{
boolean isSticky = event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.STICKY_PISTON;
boolean isSticky = event.getLevel().getBlockState(event.getPos()).getBlock() == Blocks.STICKY_PISTON;
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (event.getWorld().isClientSide() && player != null)
if (event.getLevel().isClientSide() && player != null)
{
if (isSticky)
{
BlockPos targetPos = event.getFaceOffsetPos().relative(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);
boolean canPush = PistonBaseBlock.isPushable(event.getLevel().getBlockState(targetPos), (Level) event.getLevel(), event.getFaceOffsetPos(), event.getDirection().getOpposite(), false, event.getDirection());
boolean isAir = event.getLevel().isEmptyBlock(targetPos);
player.sendSystemMessage(Component.literal(String.format(Locale.ENGLISH, "Piston will retract moving %d blocks", !isAir && canPush ? 1 : 0)));
}
else
@@ -133,7 +133,7 @@ public class PistonEventTest
}
}
// Offset twice to see if retraction will pull cobblestone
event.setCanceled(event.getWorld().getBlockState(event.getFaceOffsetPos().relative(event.getDirection())).getBlock() == Blocks.COBBLESTONE && isSticky);
event.setCanceled(event.getLevel().getBlockState(event.getFaceOffsetPos().relative(event.getDirection())).getBlock() == Blocks.COBBLESTONE && isSticky);
}
}
@@ -6,7 +6,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.event.world.BlockEvent.EntityPlaceEvent;
import net.minecraftforge.event.level.BlockEvent.EntityPlaceEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -25,7 +25,7 @@ import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -9,7 +9,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BlockEvent.BlockToolModificationEvent;
import net.minecraftforge.event.level.BlockEvent.BlockToolModificationEvent;
import net.minecraftforge.fml.common.Mod;
@Mod("tool_interact_test")
@@ -43,7 +43,7 @@ import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
@@ -110,7 +110,7 @@ public class CustomTransformTypeTest
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MODID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
public static final RegistryObject<Block>
ITEM_HANGER_BLOCK = BLOCKS.register("item_hanger", () -> new ItemHangerBlock(BlockBehaviour.Properties.of(Material.WOOL).noCollission().noOcclusion().noLootTable()));
@@ -71,7 +71,7 @@ public class MegaModelTest
public static final String MOD_ID = "mega_model_test";
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MOD_ID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MOD_ID);
private static final String REG_NAME = "test_block";
public static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register(REG_NAME, TestBlock::new);
@@ -41,7 +41,7 @@ import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -63,14 +63,14 @@ public class GravityAttributeTest
}
@SubscribeEvent
public void worldTick(TickEvent.WorldTickEvent event)
public void worldTick(TickEvent.LevelTickEvent event)
{
if (!event.world.isClientSide)
if (!event.level.isClientSide)
{
if (ticks++ > 60)
{
ticks = 0;
Level w = event.world;
Level w = event.level;
List<LivingEntity> list;
if(w.isClientSide)
{
@@ -35,7 +35,7 @@ public class PartEntityTest
static final String MOD_ID = "part_entity_test";
static final boolean ENABLED = true;
private static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, MOD_ID);
private static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, MOD_ID);
private static final RegistryObject<EntityType<TestEntity>> TEST_ENTITY = ENTITIES.register("test_entity", () -> EntityType.Builder.of(TestEntity::new, MobCategory.CREATURE).sized(16.0F, 8.0F).clientTrackingRange(10).build("test_entity"));
public PartEntityTest()
@@ -24,7 +24,7 @@ public class LivingConversionEventTest
public void canLivingConversion(LivingConversionEvent.Pre event)
{
if (event.getEntityLiving() instanceof Piglin)
if (event.getEntity() instanceof Piglin)
{
event.setCanceled(true);
event.setConversionTimer(0);
@@ -33,7 +33,7 @@ public class LivingConversionEventTest
public void onLivingConversion(LivingConversionEvent.Post event)
{
if (event.getEntityLiving() instanceof Villager)
event.getEntityLiving().addEffect(new MobEffectInstance(MobEffects.LUCK, 20));
if (event.getEntity() instanceof Villager)
event.getEntity().addEffect(new MobEffectInstance(MobEffects.LUCK, 20));
}
}
@@ -36,7 +36,7 @@ public class LivingGetProjectileEventTest
// for this test, we're checking if the player has a spectral arrow itemstack in their offhand and if they're firing a normal arrow.
// if they do, we're going to use that itemstack. if not, we will create a spectral arrow itemstack
// this demonstrates the usage of specific itemstacks with this event. you can use specific itemstacks from the player's inventory in this similar style
if (event.getEntityLiving() instanceof Player player && event.getProjectileItemStack().getItem() == Items.ARROW)
if (event.getEntity() instanceof Player player && event.getProjectileItemStack().getItem() == Items.ARROW)
{
ItemStack offhandItem = player.getOffhandItem();
event.setProjectileItemStack(offhandItem.getItem() == Items.SPECTRAL_ARROW ? offhandItem : new ItemStack(Items.SPECTRAL_ARROW));
@@ -21,7 +21,7 @@ public class PermissionsChangedEventTest
public static void onPermissionChanged(PermissionsChangedEvent event)
{
LOGGER.info("{} permission level changed to {} from {}",
event.getPlayer().getName().getString(),
event.getEntity().getName().getString(),
event.getNewLevel(),
event.getOldLevel());
}
@@ -26,7 +26,7 @@ public class PlayerGameModeEventTest
public static void onPlayerChangeGameModeEvent(PlayerEvent.PlayerChangeGameModeEvent event)
{
if (!ENABLE) return;
LOGGER.info("{} changed game mode. Current GameType: {}. New Game Type: {}", event.getPlayer(), event.getCurrentGameMode(), event.getNewGameMode());
LOGGER.info("{} changed game mode. Current GameType: {}. New Game Type: {}", event.getEntity(), event.getCurrentGameMode(), event.getNewGameMode());
// prevent changing to SURVIVAL
if (event.getNewGameMode() == GameType.SURVIVAL)
{
@@ -31,21 +31,21 @@ public class PlayerXpEventTest
public static void onPlayerPickupXp(PlayerXpEvent.PickupXp event)
{
if (!ENABLE) return;
logger.info("{} picked up an experience orb worth {}", event.getPlayer().getName().getString(), event.getOrb().getValue());
logger.info("{} picked up an experience orb worth {}", event.getEntity().getName().getString(), event.getOrb().getValue());
}
@SubscribeEvent
public static void onPlayerXpChange(PlayerXpEvent.XpChange event)
{
if (!ENABLE) return;
logger.info("{} has been given {} experience", event.getPlayer().getName().getString(), event.getAmount());
logger.info("{} has been given {} experience", event.getEntity().getName().getString(), event.getAmount());
}
@SubscribeEvent
public static void onPlayerLevelChange(PlayerXpEvent.LevelChange event)
{
if (!ENABLE) return;
logger.info("{} has changed {} levels", event.getPlayer().getName().getString(), event.getLevels());
logger.info("{} has changed {} levels", event.getEntity().getName().getString(), event.getLevels());
}
}
@@ -8,7 +8,7 @@ package net.minecraftforge.debug.fluid;
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.event.level.BlockEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -34,7 +34,7 @@ public class MilkFluidTest
ItemStack stack = event.getItemStack();
if (stack.getItem() == Items.MILK_BUCKET)
{
FluidUtil.getFluidContained(stack).ifPresent((fluid) -> event.getPlayer().displayClientMessage(Component.literal("Contains ").append(fluid.getDisplayName()), true));
FluidUtil.getFluidContained(stack).ifPresent((fluid) -> event.getEntity().displayClientMessage(Component.literal("Contains ").append(fluid.getDisplayName()), true));
}
}
}
@@ -43,7 +43,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.DeferredRegister;
@@ -67,7 +67,7 @@ public class GlobalLootModifiersTest {
}
}
private static final DeferredRegister<Codec<? extends IGlobalLootModifier>> GLM = DeferredRegister.create(ForgeRegistries.Keys.LOOT_MODIFIER_SERIALIZERS, MODID);
private static final DeferredRegister<Codec<? extends IGlobalLootModifier>> GLM = DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, MODID);
private static final DeferredRegister<Enchantment> ENCHANTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, MODID);
private static final RegistryObject<Codec<DungeonLootEnhancerModifier>> DUNGEON_LOOT = GLM.register("dungeon_loot", DungeonLootEnhancerModifier.CODEC);
@@ -34,7 +34,7 @@ public class ForgeSpawnEggItemTest
static final String MODID = "forge_spawnegg_test";
static final boolean ENABLED = true;
private static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITIES, MODID);
private static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, MODID);
private static final RegistryObject<EntityType<Pig>> ENTITY = ENTITIES.register("test_entity", () ->
EntityType.Builder.of(Pig::new, MobCategory.CREATURE).sized(1, 1).build("test_entity")
);
@@ -28,7 +28,7 @@ public class ShieldBlockTest
@SubscribeEvent
public static void shieldBlock(ShieldBlockEvent event)
{
if (event.getDamageSource().getDirectEntity() instanceof AbstractArrow arrow && event.getEntityLiving() instanceof Player player)
if (event.getDamageSource().getDirectEntity() instanceof AbstractArrow arrow && event.getEntity() instanceof Player player)
{
player.getInventory().add(new ItemStack(Items.ARROW));
event.setBlockedDamage(event.getOriginalBlockedDamage() / 2);
@@ -35,7 +35,7 @@ import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
@@ -93,7 +93,7 @@ public class ContainerTypeTest
private void registerContainers(final RegisterEvent event)
{
event.register(ForgeRegistries.Keys.CONTAINER_TYPES, helper -> helper.register("container", IForgeMenuType.create(TestContainer::new)));
event.register(ForgeRegistries.Keys.MENU_TYPES, helper -> helper.register("container", IForgeMenuType.create(TestContainer::new)));
}
private void setup(FMLClientSetupEvent event)
@@ -103,12 +103,12 @@ public class ContainerTypeTest
private void onRightClick(PlayerInteractEvent.RightClickBlock event)
{
if (!event.getWorld().isClientSide && event.getHand() == InteractionHand.MAIN_HAND)
if (!event.getLevel().isClientSide && event.getHand() == InteractionHand.MAIN_HAND)
{
if (event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.SPONGE)
if (event.getLevel().getBlockState(event.getPos()).getBlock() == Blocks.SPONGE)
{
String text = "Hello World!";
NetworkHooks.openGui((ServerPlayer) event.getPlayer(), new MenuProvider()
NetworkHooks.openScreen((ServerPlayer) event.getEntity(), new MenuProvider()
{
@Override
public AbstractContainerMenu createMenu(int p_createMenu_1_, Inventory p_createMenu_2_, Player p_createMenu_3_)
@@ -41,7 +41,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.fml.util.thread.EffectiveSide;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.RegistryBuilder;
import net.minecraftforge.registries.RegistryObject;
@@ -52,7 +52,7 @@ public class GameTestTest
public static final boolean ENABLED = true;
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 DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, MODID);
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
private static final RegistryObject<Block> ENERGY_BLOCK = BLOCKS.register("energy_block",
() -> new EnergyBlock(Properties.of(Material.STONE, MaterialColor.STONE)));
private static final RegistryObject<Item> ENERGY_BLOCK_ITEM = ITEMS.register("energy_block",
@@ -44,7 +44,7 @@ public class RecipeBookExtensionTest
public static final RegistryObject<RecipeSerializer<RecipeBookTestRecipe>> RECIPE_BOOK_TEST_RECIPE_SERIALIZER =
RECIPE_SERIALIZER.register("test_recipe", RecipeBookTestRecipeSerializer::new);
public static final DeferredRegister<MenuType<?>> MENU_TYPE = DeferredRegister.create(ForgeRegistries.CONTAINERS, MOD_ID);
public static final DeferredRegister<MenuType<?>> MENU_TYPE = DeferredRegister.create(ForgeRegistries.MENU_TYPES, MOD_ID);
public static final RegistryObject<MenuType<RecipeBookTestMenu>> RECIPE_BOOK_TEST_MENU_TYPE =
MENU_TYPE.register("test_recipe_menu", () -> IForgeMenuType.create(RecipeBookTestMenu::new));
@@ -66,10 +66,10 @@ public class RecipeBookExtensionTest
private void onRightClick(PlayerInteractEvent.RightClickBlock event)
{
if (event.getWorld().isClientSide)
if (event.getLevel().isClientSide)
return;
if (event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.GRASS_BLOCK)
NetworkHooks.openGui((ServerPlayer) event.getPlayer(), new SimpleMenuProvider((id, inv, p) -> new RecipeBookTestMenu(id, inv, ContainerLevelAccess.create(event.getWorld(), event.getPos())), Component.literal("Test")));
if (event.getLevel().getBlockState(event.getPos()).getBlock() == Blocks.GRASS_BLOCK)
NetworkHooks.openScreen((ServerPlayer) event.getEntity(), new SimpleMenuProvider((id, inv, p) -> new RecipeBookTestMenu(id, inv, ContainerLevelAccess.create(event.getLevel(), event.getPos())), Component.literal("Test")));
}
public static ResourceLocation getId(String name)
@@ -44,7 +44,7 @@ import net.minecraftforge.common.world.ModifiableBiomeInfo.BiomeInfo.Builder;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
@@ -70,7 +70,7 @@ public class BiomeModifierTest
private static final String LARGE_BASALT_COLUMNS = "large_basalt_columns";
private static final ResourceLocation LARGE_BASALT_COLUMNS_RL = new ResourceLocation(MODID, LARGE_BASALT_COLUMNS);
private static final ResourceKey<PlacedFeature> LARGE_BASALT_COLUMNS_KEY = ResourceKey.create(Registry.PLACED_FEATURE_REGISTRY, LARGE_BASALT_COLUMNS_RL);
private static final String MODIFY_BIOMES = "modify_biomes";
private static final ResourceLocation MODIFY_BIOMES_RL = new ResourceLocation(MODID, MODIFY_BIOMES);
@@ -114,19 +114,19 @@ public class BiomeModifierTest
// Create our placed feature and biome modifiers.
final ResourceKey<ConfiguredFeature<?,?>> configuredFeatureKey = NetherFeatures.LARGE_BASALT_COLUMNS.unwrapKey().get().cast(Registry.CONFIGURED_FEATURE_REGISTRY).get();
// Make sure we're using the holder from the registryaccess/registryops, the static ones won't work.
final Holder<ConfiguredFeature<?,?>> configuredFeatureHolder = ops.registry(Registry.CONFIGURED_FEATURE_REGISTRY).get().getOrCreateHolderOrThrow(configuredFeatureKey);
final Holder<ConfiguredFeature<?,?>> configuredFeatureHolder = ops.registry(Registry.CONFIGURED_FEATURE_REGISTRY).get().getOrCreateHolderOrThrow(configuredFeatureKey);
final PlacedFeature basaltFeature = new PlacedFeature(
configuredFeatureHolder,
List.of(CountOnEveryLayerPlacement.of(1), BiomeFilter.biome()));
final HolderSet.Named<Biome> badlandsTag = new HolderSet.Named<>(ops.registry(Registry.BIOME_REGISTRY).get(), BiomeTags.IS_BADLANDS);
final HolderSet.Named<Biome> forestsTag = new HolderSet.Named<>(ops.registry(Registry.BIOME_REGISTRY).get(), BiomeTags.IS_FOREST);
final BiomeModifier addBasaltFeature = new AddFeaturesBiomeModifier(
badlandsTag,
HolderSet.direct(ops.registry(Registry.PLACED_FEATURE_REGISTRY).get().getOrCreateHolderOrThrow(ResourceKey.create(Registry.PLACED_FEATURE_REGISTRY, LARGE_BASALT_COLUMNS_KEY.location()))),
Decoration.TOP_LAYER_MODIFICATION);
final BiomeModifier addSpawn = AddSpawnsBiomeModifier.singleSpawn(
badlandsTag,
new SpawnerData(EntityType.MAGMA_CUBE, 100, 1, 4));
@@ -136,22 +136,22 @@ public class BiomeModifierTest
Precipitation.SNOW,
0xFF0000
);
final BiomeModifier removeFeature = RemoveFeaturesBiomeModifier.allSteps(
forestsTag,
HolderSet.direct(ops.registry(Registry.PLACED_FEATURE_REGISTRY).get().getOrCreateHolderOrThrow(ResourceKey.create(Registry.PLACED_FEATURE_REGISTRY, new ResourceLocation("trees_birch_and_oak"))))
);
final BiomeModifier removeSpawn = new RemoveSpawnsBiomeModifier(
forestsTag,
new HolderSet.Named<>(ops.registry(Registry.ENTITY_TYPE_REGISTRY).get(), EntityTypeTags.SKELETONS)
);
// Create and add dataproviders.
generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(
generator, existingFileHelper, MODID, ops, Registry.PLACED_FEATURE_REGISTRY, Map.of(
LARGE_BASALT_COLUMNS_RL, basaltFeature)));
generator.addProvider(event.includeServer(), JsonCodecProvider.forDatapackRegistry(
generator, existingFileHelper, MODID, ops, ForgeRegistries.Keys.BIOME_MODIFIERS, Map.of(
MODIFY_BADLANDS_RL, biomeModifier,
@@ -5,7 +5,7 @@
package net.minecraftforge.debug.world;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.event.level.ChunkDataEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.apache.logging.log4j.LogManager;
@@ -20,7 +20,7 @@ public class ChunkDataEventSaveNullWorldTest {
@SubscribeEvent
public static void onChunkSave(final ChunkDataEvent.Save event)
{
if(event.getWorld() == null)
if(event.getLevel() == null)
{
LOGGER.info("Chunk at {} had null world", event.getChunk().getPos());
}
@@ -10,7 +10,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
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.event.level.ChunkWatchEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.apache.logging.log4j.LogManager;
@@ -45,7 +45,7 @@ public class ChunkWatchEventTest
--watched;
watchedByPlayer.put(event.getPlayer().getUUID(), watched);
logger.info("Unwatching chunk {} in dimension {}. Player's dimension: {}, total chunks watched by player {}",
event.getPos(), getDimensionName(event.getWorld()), getDimensionName(event.getPlayer().getCommandSenderWorld()),
event.getPos(), getDimensionName(event.getLevel()), getDimensionName(event.getPlayer().getCommandSenderWorld()),
watched);
}
@@ -56,7 +56,7 @@ public class ChunkWatchEventTest
++watched;
watchedByPlayer.put(event.getPlayer().getUUID(), watched);
logger.info("Watching chunk {} in dimension {}. Player's dimension: {}, total chunks watched by player {}",
event.getPos(), getDimensionName(event.getWorld()), getDimensionName(event.getPlayer().getCommandSenderWorld()),
event.getPos(), getDimensionName(event.getLevel()), getDimensionName(event.getPlayer().getCommandSenderWorld()),
watched);
}
@@ -30,7 +30,7 @@ import net.minecraftforge.common.world.StructureModifier;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ForgeRegistries.Keys;
@@ -11,7 +11,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.event.level.LevelEvent;
import net.minecraftforge.fml.common.Mod;
import java.util.stream.Stream;
@@ -49,9 +49,9 @@ public class IngredientInvalidationTest
MinecraftForge.EVENT_BUS.addListener(IngredientInvalidationTest::worldLoad);
}
private static void worldLoad(WorldEvent.Load event)
private static void worldLoad(LevelEvent.Load event)
{
if (event.getWorld() instanceof ServerLevel level && level.dimension().equals(Level.OVERWORLD))
if (event.getLevel() instanceof ServerLevel level && level.dimension().equals(Level.OVERWORLD))
{
TEST_INGREDIENT.getStackingIds(); // force invalidation if necessary
if (!invalidateExpected)
@@ -9,7 +9,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.EntityJoinLevelEvent;
import net.minecraftforge.eventtest.internal.EventTest;
import net.minecraftforge.eventtest.internal.TestHolder;
@@ -32,7 +32,7 @@ public class EntityJoinedWorldTest extends EventTest {
MinecraftForge.EVENT_BUS.addListener(this::eventListener);
}
private void eventListener(EntityJoinWorldEvent event) {
private void eventListener(EntityJoinLevelEvent event) {
final Entity eventEntity = event.getEntity();
final Player gamePlayer = Minecraft.getInstance().player;