First pass of registry rewrite.

Tests do not run yet.
Things of note:
Removed the idea of substitutions, just register multiple items with the same name they will override each other like a normal map.
Decoupled Forge registries from vanilla classes. They now use bouncer classes. MODDERS SHOULD NEVER USE THESE
Introduced more stringent registry locking. As it sits things are only allowed to be registered during the RegistryEvent.Registry phases!
This is to force modders to split up their registrations, and pave the way for calling these functions multiple times during a single MC lifecycle.
ObjectHolder, Missing Mappings, etc... *should* now work for all registry types, nothing should be special cased to Blocks/Items anymore.
Added optional generic dummy factory to registries, to allow registry creators the ability to dummy more then just Blocks.
Re-worked the ItemStack transformer and applied it to ItemBlock and ItemBlockSpecial. Allowing us to cleanup reflective hacks in Block callbacks.
Registry onAdd callback is now only fired on the ACTIVE registry, fixing any issues of temp registries overriding active objects.
This commit is contained in:
LexManos committed 2017-06-23 16:59:57 -05:00
1 parent 423f9fc04b
commit a26d89c876
110 files changed
+3275 -4110

No files matched your search

@@ -4,13 +4,14 @@ import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Enchantments;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "canapplyatenchantingtabletest", name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*")
@Mod(modid = CanApplyAtEnchantingTableTest.MODID, name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class CanApplyAtEnchantingTableTest
{
public static final String MODID = "canapplyatenchantingtabletest";
public static final boolean ENABLE = false;
public static final Item testItem = new Item()
@@ -34,12 +35,14 @@ public class CanApplyAtEnchantingTableTest
}
};
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
if (ENABLE)
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
{
GameRegistry.register(testItem.setRegistryName("test_item").setUnlocalizedName("FortuneEnchantableOnly").setMaxStackSize(1));
if (ENABLE)
event.getRegistry().register(testItem.setRegistryName("test_item").setUnlocalizedName("FortuneEnchantableOnly").setMaxStackSize(1));
}
}
}
@@ -10,7 +10,8 @@ import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.registries.GameData;
import javax.annotation.Nullable;
import java.util.Arrays;
@@ -51,7 +52,7 @@ public class ClientCommandTest
{
if (args.length > 0)
{
return getListOfStringsMatchingLastWord(args, GameData.getBlockRegistry().getKeys());
return getListOfStringsMatchingLastWord(args, ForgeRegistries.BLOCKS.getKeys());
}
return Collections.emptyList();
@@ -11,10 +11,10 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.TextureStitchEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nonnull;
@@ -32,13 +32,22 @@ public class CustomSpriteTest
static final String NAME = "Custom sprite test";
private static Logger logger;
@Mod.EventBusSubscriber(modid = MOD_ID)
public static class Registration
{
@SubscribeEvent
public static void registrBlocks(RegistryEvent.Register<Block> event)
{
event.getRegistry().register(new Block(Material.WOOD).setRegistryName(MOD_ID, "custom_sprite_block").setCreativeTab(CreativeTabs.MISC));
}
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
logger = event.getModLog();
MinecraftForge.EVENT_BUS.register(this);
Block block = new Block(Material.WOOD).setRegistryName(MOD_ID, "custom_sprite_block").setCreativeTab(CreativeTabs.MISC);
GameRegistry.register(block);
}
@SubscribeEvent
@@ -14,9 +14,12 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.potion.Potion;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
@@ -30,9 +33,11 @@ import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.debug.ModelFluidDebug.TestFluid;
import net.minecraftforge.debug.ModelFluidDebug.TestGas;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.player.FillBucketEvent;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -52,6 +57,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemStackHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
@@ -64,14 +70,21 @@ import javax.annotation.Nullable;
public class DynBucketTest
{
public static final String MODID = "dynbuckettest";
public static final Item dynBucket = new DynBucket();
public static final Item dynBottle = new DynBottle();
private static final ResourceLocation simpleTankName = new ResourceLocation(MODID, "simpletank");
private static final ResourceLocation testItemName = new ResourceLocation(MODID, "testitem");
private static final boolean ENABLE = true;
private static Logger logger;
@ObjectHolder("testitem")
public static final Item TEST_ITEM = null;
@ObjectHolder("simpletank")
public static final Block TANK_BLOCK = null;
@ObjectHolder("simpletank")
public static final Item TANK_ITEM = null;
@ObjectHolder("dynbottle")
public static final Item DYN_BOTTLE = null;
static
{
if (ENABLE && ModelFluidDebug.ENABLE)
@@ -80,20 +93,18 @@ public class DynBucketTest
}
}
@SuppressWarnings("unused")
public DynBucketTest()
{
if (!ENABLE || !ModelFluidDebug.ENABLE)
MinecraftForge.EVENT_BUS.register(this);
}
@SidedProxy
public static CommonProxy proxy;
public static class CommonProxy
{
void setupModels()
{
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class CommonProxy { void setupModels(){} }
public static class ServerProxy extends CommonProxy{}
public static class ClientProxy extends CommonProxy
{
@SuppressWarnings("unused")
@@ -105,10 +116,10 @@ public class DynBucketTest
return;
}
ModelLoader.setBucketModelDefinition(dynBucket);
ModelLoader.setBucketModelDefinition(DYN_BOTTLE);
final ModelResourceLocation bottle = new ModelResourceLocation(new ResourceLocation(ForgeVersion.MOD_ID, "dynbottle"), "inventory");
ModelLoader.setCustomMeshDefinition(dynBottle, new ItemMeshDefinition()
ModelLoader.setCustomMeshDefinition(DYN_BOTTLE, new ItemMeshDefinition()
{
@Override
public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
@@ -116,38 +127,48 @@ public class DynBucketTest
return bottle;
}
});
ModelBakery.registerItemVariants(dynBottle, bottle);
ModelBakery.registerItemVariants(DYN_BOTTLE, bottle);
ModelLoader.setCustomModelResourceLocation(Item.REGISTRY.getObject(simpleTankName), 0, new ModelResourceLocation(simpleTankName, "normal"));
ModelLoader.setCustomModelResourceLocation(Item.REGISTRY.getObject(testItemName), 0, new ModelResourceLocation(new ResourceLocation("minecraft", "stick"), "inventory"));
}
}
@SuppressWarnings("unused")
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
@SubscribeEvent
public static void registrBlocks(RegistryEvent.Register<Block> event)
{
event.getRegistry().register(new BlockSimpleTank().setRegistryName(simpleTankName));
}
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
{
FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestFluid.name));
FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestGas.name));
event.getRegistry().registerAll(
new TestItem().setRegistryName(testItemName),
new ItemBlock(TANK_BLOCK).setRegistryName(simpleTankName),
new DynBottle()
);
}
@SubscribeEvent
public static void registrRecipes(RegistryEvent.Register<IRecipe> event)
{
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(TestFluid.instance, Fluid.BUCKET_VOLUME));
GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.func_193368_a(Items.DIAMOND));
}
}
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (!ENABLE || !ModelFluidDebug.ENABLE)
{
return;
}
logger = event.getModLog();
GameRegistry.register(new TestItem(), testItemName);
Block tank = new BlockSimpleTank();
GameRegistry.register(tank, simpleTankName);
GameRegistry.register(new ItemBlock(tank), simpleTankName);
GameRegistry.registerTileEntity(TileSimpleTank.class, "simpletank");
FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestFluid.name));
FluidRegistry.addBucketForFluid(FluidRegistry.getFluid(TestGas.name));
//GameRegistry.registerItem(dynBucket, "dynbucket");
GameRegistry.register(dynBottle);
ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(TestFluid.instance, Fluid.BUCKET_VOLUME));
//GameRegistry.addShapelessRecipe(new ItemStack(Items.DIAMOND), filledBucket);
proxy.setupModels();
//MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
@@ -224,32 +245,6 @@ public class DynBucketTest
}
}
public static class DynBucket extends Item
{
public DynBucket()
{
setUnlocalizedName("dynbucket");
setMaxStackSize(1);
setHasSubtypes(true);
setCreativeTab(CreativeTabs.MISC);
}
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems)
{
if (!this.isInCreativeTab(tab))
return;
for (int i = 0; i < 4; i++)
{
ItemStack bucket = new ItemStack(this, 1, i);
if (FluidUtil.getFluidContained(bucket) != null)
{
subItems.add(bucket);
}
}
}
}
public static class DynBottle extends UniversalBucket
{
public DynBottle()
@@ -1,5 +1,6 @@
package net.minecraftforge.debug;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -8,7 +9,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
@@ -22,6 +22,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.BlockFluidFinite;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -33,7 +34,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -57,38 +58,52 @@ public class FluidPlacementTest
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (ENABLE && ModelFluidDebug.ENABLE)
{
proxy.preInit(event);
}
if (!ENABLE || !ModelFluidDebug.ENABLE)
return;
proxy.preInit();
}
public static class CommonProxy
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registrBlocks(RegistryEvent.Register<Block> event)
{
if (!ENABLE || !ModelFluidDebug.ENABLE)
return;
event.getRegistry().registerAll(
FiniteFluidBlock.instance
);
}
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
{
if (!ENABLE || !ModelFluidDebug.ENABLE)
return;
FluidRegistry.registerFluid(FiniteFluid.instance);
FluidRegistry.addBucketForFluid(FiniteFluid.instance);
GameRegistry.register(EmptyFluidContainer.instance);
GameRegistry.register(FluidContainer.instance);
GameRegistry.register(FiniteFluidBlock.instance);
GameRegistry.register(new ItemBlock(FiniteFluidBlock.instance).setRegistryName(FiniteFluidBlock.instance.getRegistryName()));
event.getRegistry().registerAll(
EmptyFluidContainer.instance,
FluidContainer.instance,
new ItemBlock(FiniteFluidBlock.instance).setRegistryName(FiniteFluidBlock.instance.getRegistryName())
);
MinecraftForge.EVENT_BUS.register(FluidContainer.instance);
}
}
public static class ServerProxy extends CommonProxy
{
public static class CommonProxy {
public void preInit(){}
}
public static class ServerProxy extends CommonProxy{}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + FiniteFluidBlock.name, "normal");
@Override
public void preInit(FMLPreInitializationEvent event)
public void preInit()
{
super.preInit(event);
Item fluid = Item.getItemFromBlock(FiniteFluidBlock.instance);
ModelLoader.setCustomModelResourceLocation(EmptyFluidContainer.instance, 0, new ModelResourceLocation("forge:bucket", "inventory"));
ModelLoader.setBucketModelDefinition(FluidContainer.instance);
@@ -246,7 +261,7 @@ public class FluidPlacementTest
{
if (!this.isInCreativeTab(tab))
return;
Fluid[] fluids = new Fluid[]{FluidRegistry.WATER, FluidRegistry.LAVA, FiniteFluid.instance, ModelFluidDebug.TestFluid.instance};
Fluid[] fluids = new Fluid[]{FluidRegistry.WATER, FluidRegistry.LAVA, FiniteFluid.instance, ModelFluidDebug.FLUID};
// add 16 variable fillings
for (Fluid fluid : fluids)
{
@@ -6,9 +6,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = ItemCanDestroyBlocksInCreativeTest.MODID, name = "Item.canDestroyBlockInCreative() Test", version = "1.0", acceptableRemoteVersions = "*")
public class ItemCanDestroyBlocksInCreativeTest
@@ -16,23 +16,27 @@ public class ItemCanDestroyBlocksInCreativeTest
public static final boolean ENABLE = true;
public static final String MODID = "item_can_destroy_blocks_in_creative_test";
public static Item testItem = new Item()
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
@Override
public boolean canDestroyBlockInCreative(World world, BlockPos pos, ItemStack stack, EntityPlayer player)
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
{
return false;
}
}.setRegistryName(MODID, "item_test")
.setUnlocalizedName(MODID + ".item_test")
.setCreativeTab(CreativeTabs.TOOLS);
if (!ENABLE)
return;
@Mod.EventHandler
public static void init(FMLInitializationEvent event)
{
if (ENABLE)
{
GameRegistry.register(testItem);
Item test = new Item()
{
@Override
public boolean canDestroyBlockInCreative(World world, BlockPos pos, ItemStack stack, EntityPlayer player)
{
return false;
}
}.setRegistryName(MODID, "item_test")
.setUnlocalizedName(MODID + ".item_test")
.setCreativeTab(CreativeTabs.TOOLS);
event.getRegistry().register(test);
}
}
}
}
@@ -11,12 +11,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nullable;
import java.util.Random;
@@ -26,43 +26,27 @@ public class ItemLayerModelDebug
{
public static final String MODID = "forgedebugitemlayermodel";
public static final String VERSION = "1.0";
@ObjectHolder("test_item")
public static final Item TEST_ITEM = null;
@SidedProxy
public static CommonProxy proxy;
@EventHandler
public void preInit(FMLPreInitializationEvent event)
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
proxy.preInit(event);
}
public static class CommonProxy
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
{
GameRegistry.register(TestItem.instance);
event.getRegistry().register(new TestItem());
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation modelLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestItem.name, "inventory");
@Override
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
super.preInit(event);
ModelLoader.setCustomModelResourceLocation(TestItem.instance, 0, modelLocation);
ModelLoader.setCustomModelResourceLocation(TEST_ITEM, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + TestItem.name, "inventory"));
}
}
public static final class TestItem extends Item
{
public static final TestItem instance = new TestItem();
public static final String name = "test_item";
private TestItem()
@@ -1,5 +1,6 @@
package net.minecraftforge.debug;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
@@ -9,6 +10,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.potion.Potion;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
@@ -16,6 +18,9 @@ import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.debug.ObjectHolderTest.CustomRegistryEntry;
import net.minecraftforge.debug.ObjectHolderTest.ICustomRegistryEntry;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -23,7 +28,10 @@ import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.registries.RegistryBuilder;
import static org.lwjgl.opengl.GL11.*;
@@ -31,8 +39,8 @@ import static org.lwjgl.opengl.GL11.*;
public class ItemTileDebug
{
public static final String MODID = "forgedebugitemtile";
private static String blockName = MODID.toLowerCase() + ":" + TestBlock.name;
@ObjectHolder(TestBlock.name)
public static final Block TEST_BLOCK = null;
@SidedProxy
public static CommonProxy proxy;
@@ -49,34 +57,43 @@ public class ItemTileDebug
proxy.init(event);
}
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
event.getRegistry().register(new TestBlock());
}
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().register(new ItemBlock(TEST_BLOCK).setRegistryName(TEST_BLOCK.getRegistryName()));
}
}
public static class CommonProxy
{
public void preInit(FMLPreInitializationEvent event)
{
GameRegistry.register(TestBlock.instance);
GameRegistry.register(new ItemBlock(TestBlock.instance).setRegistryName(TestBlock.instance.getRegistryName()));
GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity");
}
public void init(FMLInitializationEvent event)
{
}
public void init(FMLInitializationEvent event){}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ServerProxy extends CommonProxy{}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "normal");
private static ModelResourceLocation itemLocation = new ModelResourceLocation(TEST_BLOCK.getRegistryName(), "normal");
@SuppressWarnings("deprecation")
@Override
public void preInit(FMLPreInitializationEvent event)
{
super.preInit(event);
Item item = Item.getItemFromBlock(TestBlock.instance);
Item item = ForgeRegistries.ITEMS.getValue(new ResourceLocation(MODID, TestBlock.name));
ForgeHooksClient.registerTESRItemStack(item, 0, CustomTileEntity.class);
ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation);
MinecraftForge.EVENT_BUS.register(BakeEventHandler.instance);
@@ -100,7 +117,7 @@ public class ItemTileDebug
@SubscribeEvent
public void onModelBakeEvent(ModelBakeEvent event)
{
event.getModelManager().getBlockModelShapes().registerBuiltInBlocks(TestBlock.instance);
event.getModelManager().getBlockModelShapes().registerBuiltInBlocks(TEST_BLOCK);
}
}
@@ -134,7 +151,6 @@ public class ItemTileDebug
public static class TestBlock extends BlockContainer
{
public static final TestBlock instance = new TestBlock();
public static final String name = "custom_model_block";
private TestBlock()
@@ -44,6 +44,8 @@ import net.minecraftforge.common.model.animation.IAnimationStateMachine;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.debug.ItemTileDebug.TestBlock;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
@@ -52,8 +54,11 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nonnull;
@@ -65,9 +70,12 @@ public class ModelAnimationDebug
public static final String MODID = "forgedebugmodelanimation";
public static final String VERSION = "0.0";
public static String blockName = "test_animation_block";
public static ResourceLocation blockId = new ResourceLocation(MODID, blockName);
public static final String blockName = "test_animation_block";
public static final PropertyDirection FACING = PropertyDirection.create("facing");
@ObjectHolder(blockName)
public static final Block TEST_BLOCK = null;
@ObjectHolder(blockName)
public static final Item TEST_ITEM = null;
@Instance(MODID)
public static ModelAnimationDebug instance;
@@ -76,16 +84,20 @@ public class ModelAnimationDebug
public static CommonProxy proxy;
private static Logger logger;
public static abstract class CommonProxy
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
GameRegistry.register(new Block(Material.WOOD)
event.getRegistry().register(
new Block(Material.WOOD)
{
{
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + "." + blockName);
setRegistryName(blockId);
setRegistryName(new ResourceLocation(MODID, blockName));
}
@Override
@@ -166,14 +178,28 @@ public class ModelAnimationDebug
return true;
}
});
GameRegistry.register(new ItemBlock(Block.REGISTRY.getObject(blockId))
{
@Override
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt)
}
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().register(
new ItemBlock(TEST_BLOCK)
{
return new ItemAnimationHolder();
}
}.setRegistryName(blockId));
@Override
public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt)
{
return new ItemAnimationHolder();
}
}.setRegistryName(TEST_BLOCK.getRegistryName())
);
}
}
public static abstract class CommonProxy
{
public void preInit(FMLPreInitializationEvent event)
{
GameRegistry.registerTileEntity(Chest.class, MODID + ":" + "tile_" + blockName);
}
@@ -197,7 +223,7 @@ public class ModelAnimationDebug
{
super.preInit(event);
B3DLoader.INSTANCE.addDomain(MODID);
ModelLoader.setCustomModelResourceLocation(Item.REGISTRY.getObject(blockId), 0, new ModelResourceLocation(blockId, "inventory"));
ModelLoader.setCustomModelResourceLocation(TEST_ITEM, 0, new ModelResourceLocation(TEST_ITEM.getRegistryName(), "inventory"));
ClientRegistry.bindTileEntitySpecialRenderer(Chest.class, new AnimationTESR<Chest>()
{
@Override
@@ -2,6 +2,8 @@ package net.minecraftforge.debug;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Ints;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@@ -31,18 +33,18 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nullable;
import java.util.ArrayList;
@@ -56,6 +58,13 @@ public class ModelBakeEventDebug
public static final int cubeSize = 3;
private static ResourceLocation blockName = new ResourceLocation(MODID, CustomModelBlock.name);
private static ModelResourceLocation blockLocation = new ModelResourceLocation(blockName, "normal");
private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "inventory");
@ObjectHolder(CustomModelBlock.name)
public static final Block CUSTOM_BLOCK = null;
@ObjectHolder(CustomModelBlock.name)
public static final Block CUSTOM_ITEM = null;
@SuppressWarnings("unchecked")
public static final IUnlistedProperty<Integer>[] properties = new IUnlistedProperty[6];
@@ -68,41 +77,28 @@ public class ModelBakeEventDebug
}
}
@SidedProxy
public static CommonProxy proxy;
@EventHandler
public void preInit(FMLPreInitializationEvent event)
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
proxy.preInit(event);
}
public static class CommonProxy
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
GameRegistry.register(CustomModelBlock.instance);
GameRegistry.register(new ItemBlock(CustomModelBlock.instance).setRegistryName(CustomModelBlock.instance.getRegistryName()));
event.getRegistry().register(new CustomModelBlock());
GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity");
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation blockLocation = new ModelResourceLocation(blockName, "normal");
private static ModelResourceLocation itemLocation = new ModelResourceLocation(blockName, "inventory");
@Override
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
super.preInit(event);
Item item = Item.getItemFromBlock(CustomModelBlock.instance);
event.getRegistry().register(new ItemBlock(CUSTOM_BLOCK).setRegistryName(CUSTOM_BLOCK.getRegistryName()));
}
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
Item item = Item.getItemFromBlock(CUSTOM_BLOCK);
ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation);
ModelLoader.setCustomStateMapper(CustomModelBlock.instance, new StateMapperBase()
ModelLoader.setCustomStateMapper(CUSTOM_BLOCK, new StateMapperBase()
{
protected ModelResourceLocation getModelResourceLocation(IBlockState p_178132_1_)
{
@@ -127,14 +123,13 @@ public class ModelBakeEventDebug
TextureAtlasSprite base = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/slime");
TextureAtlasSprite overlay = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:blocks/redstone_block");
IBakedModel customModel = new CustomModel(base, overlay);
event.getModelRegistry().putObject(ClientProxy.blockLocation, customModel);
event.getModelRegistry().putObject(ClientProxy.itemLocation, customModel);
event.getModelRegistry().putObject(blockLocation, customModel);
event.getModelRegistry().putObject(itemLocation, customModel);
}
}
public static class CustomModelBlock extends BlockContainer
{
public static final CustomModelBlock instance = new CustomModelBlock();
public static final String name = "custom_model_block";
private CustomModelBlock()
@@ -1,28 +1,27 @@
package net.minecraftforge.debug;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import javax.annotation.Nonnull;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = ModelFluidDebug.MODID, name = "ForgeDebugModelFluid", version = ModelFluidDebug.VERSION, acceptableRemoteVersions = "*")
public class ModelFluidDebug
@@ -31,94 +30,93 @@ public class ModelFluidDebug
public static final String VERSION = "1.0";
public static final boolean ENABLE = true;
private static ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "fluid");
private static ModelResourceLocation gasLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "gas");
private static ModelResourceLocation milkLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "milk");
@ObjectHolder(TestFluidBlock.name)
public static final Block FLUID_BLOCK = null;
@ObjectHolder(TestFluidBlock.name)
public static final Item FLUID_ITEM = null;
@ObjectHolder(TestGasBlock.name)
public static final Block GAS_BLOCK = null;
@ObjectHolder(TestGasBlock.name)
public static final Item GAS_ITEM = null;
@ObjectHolder(MilkFluidBlock.name)
public static final Block MILK_BLOCK = null;
@ObjectHolder(MilkFluidBlock.name)
public static final Item MILK_ITEM = null;
@SidedProxy
public static CommonProxy proxy;
//Used in DynBucketTest/FluidPlacementTest, TODO: Make this a full registry with @ObjectHolder?
public static final Fluid MILK = new Fluid("milk", new ResourceLocation(ForgeVersion.MOD_ID, "blocks/milk_still"), new ResourceLocation(ForgeVersion.MOD_ID, "blocks/milk_flow"));
public static final Fluid FLUID = new TestFluid();
public static final Fluid GAS = new TestGas();
public static final Fluid milkFluid = new Fluid("milk", new ResourceLocation(ForgeVersion.MOD_ID, "blocks/milk_still"), new ResourceLocation(ForgeVersion.MOD_ID, "blocks/milk_flow"));
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (ENABLE)
{
proxy.preInit(event);
FluidRegistry.registerFluid(FLUID);
FluidRegistry.registerFluid(GAS);
FluidRegistry.registerFluid(MILK);
}
}
public static class CommonProxy
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
FluidRegistry.registerFluid(TestFluid.instance);
FluidRegistry.registerFluid(TestGas.instance);
FluidRegistry.registerFluid(milkFluid);
GameRegistry.register(TestFluidBlock.instance);
GameRegistry.register(new ItemBlock(TestFluidBlock.instance).setRegistryName(TestFluidBlock.instance.getRegistryName()));
GameRegistry.register(TestGasBlock.instance);
GameRegistry.register(new ItemBlock(TestGasBlock.instance).setRegistryName(TestGasBlock.instance.getRegistryName()));
GameRegistry.register(MilkFluidBlock.instance);
GameRegistry.register(new ItemBlock(MilkFluidBlock.instance).setRegistryName(MilkFluidBlock.instance.getRegistryName()));
if (!ENABLE)
return;
event.getRegistry().registerAll(
new TestFluidBlock(),
new TestGasBlock(),
new MilkFluidBlock()
);
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ClientProxy extends CommonProxy
{
private static ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "fluid");
private static ModelResourceLocation gasLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "gas");
private static ModelResourceLocation milkLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + TestFluidBlock.name, "milk");
@Override
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
super.preInit(event);
Item fluid = Item.getItemFromBlock(TestFluidBlock.instance);
Item gas = Item.getItemFromBlock(TestGasBlock.instance);
Item milk = Item.getItemFromBlock(MilkFluidBlock.instance);
if (!ENABLE)
return;
event.getRegistry().registerAll(
new ItemBlock(FLUID_BLOCK).setRegistryName(FLUID_BLOCK.getRegistryName()),
new ItemBlock(GAS_BLOCK).setRegistryName(GAS_BLOCK.getRegistryName()),
new ItemBlock(MILK_BLOCK).setRegistryName(MILK_BLOCK.getRegistryName())
);
}
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (!ENABLE)
return;
// no need to pass the locations here, since they'll be loaded by the block model logic.
ModelBakery.registerItemVariants(fluid);
ModelBakery.registerItemVariants(gas);
ModelBakery.registerItemVariants(milk);
ModelLoader.setCustomMeshDefinition(fluid, new ItemMeshDefinition()
{
public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
{
return fluidLocation;
}
});
ModelLoader.setCustomMeshDefinition(gas, new ItemMeshDefinition()
{
public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
{
return gasLocation;
}
});
ModelLoader.setCustomMeshDefinition(milk, new ItemMeshDefinition()
{
public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
{
return milkLocation;
}
});
ModelLoader.setCustomStateMapper(TestFluidBlock.instance, new StateMapperBase()
ModelBakery.registerItemVariants(FLUID_ITEM);
ModelBakery.registerItemVariants(GAS_ITEM);
ModelBakery.registerItemVariants(MILK_ITEM);
ModelLoader.setCustomMeshDefinition(FLUID_ITEM, is -> fluidLocation);
ModelLoader.setCustomMeshDefinition(GAS_ITEM, is -> gasLocation);
ModelLoader.setCustomMeshDefinition(MILK_ITEM, is -> milkLocation);
ModelLoader.setCustomStateMapper(FLUID_BLOCK, new StateMapperBase()
{
protected ModelResourceLocation getModelResourceLocation(IBlockState state)
{
return fluidLocation;
}
});
ModelLoader.setCustomStateMapper(TestGasBlock.instance, new StateMapperBase()
ModelLoader.setCustomStateMapper(GAS_BLOCK, new StateMapperBase()
{
protected ModelResourceLocation getModelResourceLocation(IBlockState state)
{
return gasLocation;
}
});
ModelLoader.setCustomStateMapper(MilkFluidBlock.instance, new StateMapperBase()
ModelLoader.setCustomStateMapper(MILK_BLOCK, new StateMapperBase()
{
protected ModelResourceLocation getModelResourceLocation(IBlockState state)
{
@@ -131,7 +129,6 @@ public class ModelFluidDebug
public static final class TestFluid extends Fluid
{
public static final String name = "testfluid";
public static final TestFluid instance = new TestFluid();
private TestFluid()
{
@@ -148,7 +145,6 @@ public class ModelFluidDebug
public static final class TestGas extends Fluid
{
public static final String name = "testgas";
public static final TestGas instance = new TestGas();
private TestGas()
{
@@ -166,12 +162,11 @@ public class ModelFluidDebug
public static final class TestFluidBlock extends BlockFluidClassic
{
public static final TestFluidBlock instance = new TestFluidBlock();
public static final String name = "test_fluid_block";
private TestFluidBlock()
{
super(TestFluid.instance, Material.WATER);
super(FLUID, Material.WATER);
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name));
@@ -180,12 +175,11 @@ public class ModelFluidDebug
public static final class MilkFluidBlock extends BlockFluidClassic
{
public static final MilkFluidBlock instance = new MilkFluidBlock();
public static final String name = "milk_fluid_block";
private MilkFluidBlock()
{
super(milkFluid, Material.WATER);
super(MILK, Material.WATER);
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name));
@@ -194,12 +188,11 @@ public class ModelFluidDebug
public static final class TestGasBlock extends BlockFluidClassic
{
public static final TestGasBlock instance = new TestGasBlock();
public static final String name = "test_gas_block";
private TestGasBlock()
{
super(TestGas.instance, Material.LAVA);
super(GAS, Material.LAVA);
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name));
@@ -1,7 +1,6 @@
package net.minecraftforge.debug;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import com.google.common.collect.UnmodifiableIterator;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
@@ -28,6 +27,7 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.b3d.B3DLoader;
import net.minecraftforge.client.model.obj.OBJLoader;
@@ -39,11 +39,13 @@ import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import org.apache.logging.log4j.Logger;
import javax.vecmath.AxisAngle4d;
@@ -62,71 +64,100 @@ public class ModelLoaderRegistryDebug
public static final String VERSION = "1.0";
private static Logger logger;
@ObjectHolder(CustomModelBlock.name)
public static final Block CUSTOM_MODEL_BLOCK = null;
@ObjectHolder(OBJTesseractBlock.name)
public static final Block TESSERACT_BLOCK = null;
@ObjectHolder(OBJVertexColoring1.name)
public static final Block VERTEX_COLOR_1 = null;
@ObjectHolder(OBJVertexColoring2.name)
public static final Block VERTEX_COLOR_2 = null;
@ObjectHolder(OBJDirectionBlock.name)
public static final Block DIRECTION = null;
@ObjectHolder(OBJDirectionEye.name)
public static final Block DIRECTION_EYE = null;
@ObjectHolder(OBJDynamicEye.name)
public static final Block DYNAMIC_EYE = null;
@ObjectHolder(OBJCustomDataBlock.name)
public static final Block CUSTOM_DATA = null;
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
if (!ENABLED)
{
return;
}
logger = event.getModLog();
List<Block> blocks = Lists.newArrayList();
blocks.add(CustomModelBlock.instance);
blocks.add(OBJTesseractBlock.instance);
blocks.add(OBJVertexColoring1.instance);
//blocks.add(OBJDirectionEye.instance);
blocks.add(OBJVertexColoring2.instance);
blocks.add(OBJDirectionBlock.instance);
blocks.add(OBJCustomDataBlock.instance);
//blocks.add(OBJDynamicEye.instance);
for (Block block : blocks)
{
GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
}
GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name);
GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name);
//GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name);
if (event.getSide() == Side.CLIENT)
{
clientPreInit();
}
}
private void clientPreInit()
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
B3DLoader.INSTANCE.addDomain(MODID.toLowerCase());
Item item = Item.getItemFromBlock(CustomModelBlock.instance);
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + CustomModelBlock.name, "inventory"));
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
if (!ENABLED)
return;
event.getRegistry().registerAll(
new CustomModelBlock(),
new OBJTesseractBlock(),
new OBJVertexColoring1(),
new OBJVertexColoring2(),
new OBJDirectionBlock(),
//new OBJDirectionEye(),
//new OBJDynamicEye(),
new OBJCustomDataBlock()
);
GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name);
GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name);
//GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name);
}
OBJLoader.INSTANCE.addDomain(MODID.toLowerCase());
Item item2 = Item.getItemFromBlock(OBJTesseractBlock.instance);
ModelLoader.setCustomModelResourceLocation(item2, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJTesseractBlock.name, "inventory"));
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
if (!ENABLED)
return;
Block[] blocks = {
CUSTOM_MODEL_BLOCK,
TESSERACT_BLOCK,
VERTEX_COLOR_1,
VERTEX_COLOR_2,
DIRECTION,
//DIRECTION_EYE,
//DYNAMIC_EYE,
CUSTOM_DATA
};
for (Block block : blocks)
event.getRegistry().register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
}
Item item3 = Item.getItemFromBlock(OBJVertexColoring1.instance);
ModelLoader.setCustomModelResourceLocation(item3, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJVertexColoring1.name, "inventory"));
//Item item4 = Item.getItemFromBlock(OBJDirectionEye.instance);
//ModelLoader.setCustomModelResourceLocation(item4, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDirectionEye.name, "inventory"));
Item item5 = Item.getItemFromBlock(OBJVertexColoring2.instance);
ModelLoader.setCustomModelResourceLocation(item5, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJVertexColoring2.name, "inventory"));
Item item6 = Item.getItemFromBlock(OBJDirectionBlock.instance);
ModelLoader.setCustomModelResourceLocation(item6, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDirectionBlock.name, "inventory"));
Item item7 = Item.getItemFromBlock(OBJCustomDataBlock.instance);
ModelLoader.setCustomModelResourceLocation(item7, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJCustomDataBlock.name, "inventory"));
//Item item8 = Item.getItemFromBlock(OBJDynamicEye.instance);
//ModelLoader.setCustomModelResourceLocation(item8, 0, new ModelResourceLocation(MODID.toLowerCase() + ":" + OBJDynamicEye.name, "inventory"));
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (!ENABLED)
return;
B3DLoader.INSTANCE.addDomain(MODID.toLowerCase());
OBJLoader.INSTANCE.addDomain(MODID.toLowerCase());
Block[] blocks = {
CUSTOM_MODEL_BLOCK,
TESSERACT_BLOCK,
VERTEX_COLOR_1,
VERTEX_COLOR_2,
DIRECTION,
//DIRECTION_EYE,
//DYNAMIC_EYE,
CUSTOM_DATA
};
for (Block block : blocks)
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(block.getRegistryName(), "inventory"));
}
}
public static class CustomModelBlock extends Block
{
public static final PropertyDirection FACING = PropertyDirection.create("facing");
public static final CustomModelBlock instance = new CustomModelBlock();
public static final String name = "custom_model_block";
private int counter = 1;
@@ -243,7 +274,6 @@ public class ModelLoaderRegistryDebug
*/
public static class OBJTesseractBlock extends Block implements ITileEntityProvider
{
public static final OBJTesseractBlock instance = new OBJTesseractBlock();
public static final String name = "obj_tesseract_block";
private OBJTesseractBlock()
@@ -404,7 +434,6 @@ public class ModelLoaderRegistryDebug
*/
public static class OBJVertexColoring1 extends Block
{
public static final OBJVertexColoring1 instance = new OBJVertexColoring1();
public static final String name = "obj_vertex_coloring1";
private OBJVertexColoring1()
@@ -445,7 +474,6 @@ public class ModelLoaderRegistryDebug
public static class OBJDirectionEye extends Block
{
public static final PropertyDirection FACING = PropertyDirection.create("facing");
public static final OBJDirectionEye instance = new OBJDirectionEye();
public static final String name = "obj_direction_eye";
private OBJDirectionEye()
@@ -529,7 +557,6 @@ public class ModelLoaderRegistryDebug
*/
public static class OBJVertexColoring2 extends Block implements ITileEntityProvider
{
public static final OBJVertexColoring2 instance = new OBJVertexColoring2();
public static final String name = "obj_vertex_coloring2";
private OBJVertexColoring2()
@@ -633,7 +660,6 @@ public class ModelLoaderRegistryDebug
public static class OBJDirectionBlock extends Block
{
public static final PropertyDirection FACING = PropertyDirection.create("facing");
public static final OBJDirectionBlock instance = new OBJDirectionBlock();
public static final String name = "obj_direction_block";
private OBJDirectionBlock()
@@ -720,7 +746,6 @@ public class ModelLoaderRegistryDebug
public static final PropertyBool SOUTH = PropertyBool.create("south");
public static final PropertyBool WEST = PropertyBool.create("west");
public static final PropertyBool EAST = PropertyBool.create("east");
public static final OBJCustomDataBlock instance = new OBJCustomDataBlock();
public static final String name = "obj_custom_data_block";
private OBJCustomDataBlock()
@@ -777,7 +802,6 @@ public class ModelLoaderRegistryDebug
*/
public static class OBJDynamicEye extends Block implements ITileEntityProvider
{
public static final OBJDynamicEye instance = new OBJDynamicEye();
public static final String name = "obj_dynamic_eye";
private OBJDynamicEye()
@@ -9,76 +9,75 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = MultiLayerModelDebug.MODID, name = "ForgeDebugMultiLayerModel", version = MultiLayerModelDebug.VERSION, acceptableRemoteVersions = "*")
public class MultiLayerModelDebug
{
private static final boolean ENABLED = true;
public static final String MODID = "forgedebugmultilayermodel";
public static final String VERSION = "0.0";
private static String blockName = "test_layer_block";
private static final String blockName = "test_layer_block";
private static final ResourceLocation blockId = new ResourceLocation(MODID, blockName);
@ObjectHolder(blockName)
public static final Block TEST_BLOCK = null;
@SidedProxy
public static CommonProxy proxy;
public static class CommonProxy
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
GameRegistry.register(new Block(Material.WOOD)
{
if (!ENABLED)
return;
event.getRegistry().register(
new Block(Material.WOOD)
{
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + "." + blockName);
setRegistryName(blockId);
}
{
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + "." + blockName);
setRegistryName(blockId);
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{
return false;
}
@Override
public boolean isFullCube(IBlockState state)
{
return false;
}
@Override
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return layer == BlockRenderLayer.SOLID || layer == BlockRenderLayer.TRANSLUCENT;
@Override
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return layer == BlockRenderLayer.SOLID || layer == BlockRenderLayer.TRANSLUCENT;
}
}
});
GameRegistry.register(new ItemBlock(Block.REGISTRY.getObject(blockId)).setRegistryName(blockId));
);
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ClientProxy extends CommonProxy
{
@Override
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
super.preInit(event);
ModelLoader.setCustomModelResourceLocation(Item.REGISTRY.getObject(blockId), 0, new ModelResourceLocation(blockId, "inventory"));
event.getRegistry().register(new ItemBlock(TEST_BLOCK).setRegistryName(TEST_BLOCK.getRegistryName()));
}
}
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
proxy.preInit(event);
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (!ENABLED)
return;
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(TEST_BLOCK), 0, new ModelResourceLocation(blockId, "inventory"));
}
}
}
@@ -5,41 +5,53 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nullable;
@Mod(modid = NBTShareTagItemTest.MOD_ID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*")
@Mod(modid = NBTShareTagItemTest.MODID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*")
public class NBTShareTagItemTest
{
public static final String MOD_ID = "nbtsharetagitemtest";
private static final ResourceLocation itemName = new ResourceLocation(MOD_ID, "nbt_share_tag_item");
public static final String MODID = "nbtsharetagitemtest";
private static final ResourceLocation itemName = new ResourceLocation(MODID, "nbt_share_tag_item");
@ObjectHolder("nbt_share_tag_item")
public static final Item TEST_ITEM = null;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
ShareTagItem item = new ShareTagItem();
item.setRegistryName(itemName);
GameRegistry.register(item);
if (event.getSide() == Side.CLIENT)
@SubscribeEvent
public static void registerRecipes(RegistryEvent.Register<IRecipe> event)
{
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(itemName, "inventory"));
ItemStack crafted = new ItemStack(TEST_ITEM);
NBTTagCompound nbt = new NBTTagCompound();
nbt.setBoolean("crafted", true);
crafted.setTagCompound(nbt);
GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "nbt_share"), null, crafted, Ingredient.func_193367_a(Items.STICK));
}
ItemStack crafted = new ItemStack(item);
NBTTagCompound craftedNBT = new NBTTagCompound();
craftedNBT.setBoolean("crafted", true);
crafted.setTagCompound(craftedNBT);
//CraftingManager.getInstance().addShapelessRecipe(crafted, new ItemStack(Items.STICK));
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().register(new ShareTagItem().setRegistryName(itemName));
}
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
ModelLoader.setCustomModelResourceLocation(TEST_ITEM, 0, new ModelResourceLocation(itemName, "inventory"));
}
}
public static class ShareTagItem extends Item
@@ -16,6 +16,7 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
@@ -24,14 +25,14 @@ import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.player.PlayerWakeUpEvent;
import net.minecraftforge.event.entity.player.SleepingLocationCheckEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -43,38 +44,30 @@ public class NoBedSleepingTest
public static final String VERSION = "1.0";
@CapabilityInject(IExtraSleeping.class)
private static final Capability<IExtraSleeping> SLEEP_CAP = null;
@ObjectHolder(ItemSleepingPill.name)
public static final Item SLEEPING_PILL = null;
@SidedProxy
public static CommonProxy proxy = null;
public static abstract class CommonProxy
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
GameRegistry.register(ItemSleepingPill.instance);
CapabilityManager.INSTANCE.register(IExtraSleeping.class, new Storage(), DefaultImpl.class);
MinecraftForge.EVENT_BUS.register(new EventHandler());
event.getRegistry().register(new ItemSleepingPill());
}
}
public static final class ServerProxy extends CommonProxy
{
}
public static final class ClientProxy extends CommonProxy
{
@Override
public void preInit(FMLPreInitializationEvent event)
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
super.preInit(event);
ModelLoader.setCustomModelResourceLocation(ItemSleepingPill.instance, 0, new ModelResourceLocation(new ResourceLocation(MODID, ItemSleepingPill.name), "inventory"));
ModelLoader.setCustomModelResourceLocation(SLEEPING_PILL, 0, new ModelResourceLocation(SLEEPING_PILL.getRegistryName(), "inventory"));
}
}
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
proxy.preInit(event);
CapabilityManager.INSTANCE.register(IExtraSleeping.class, new Storage(), DefaultImpl.class);
MinecraftForge.EVENT_BUS.register(new EventHandler());
}
public static class EventHandler
@@ -180,7 +173,6 @@ public class NoBedSleepingTest
public static class ItemSleepingPill extends Item
{
public static final ItemSleepingPill instance = new ItemSleepingPill();
public static final String name = "sleeping_pill";
private ItemSleepingPill()
@@ -5,7 +5,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
@Mod(modid = NoPotionEffectRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*")
public class NoPotionEffectRenderTest
@@ -15,8 +15,8 @@ public class NoPotionEffectRenderTest
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
TestPotion INSTANCE = new TestPotion(new ResourceLocation(modID, "test_potion"), false, 0xff00ff);
GameData.getPotionRegistry().register(-1, new ResourceLocation(modID, "test_potion"), INSTANCE);
TestPotion INSTANCE = (TestPotion)new TestPotion(new ResourceLocation(modID, "test_potion"), false, 0xff00ff).setRegistryName(new ResourceLocation(modID, "test_potion"));
ForgeRegistries.POTIONS.register(INSTANCE);
}
public static class TestPotion extends Potion
@@ -9,15 +9,13 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.IForgeRegistry;
import net.minecraftforge.fml.common.registry.IForgeRegistryEntry;
import net.minecraftforge.fml.common.registry.RegistryBuilder;
import net.minecraftforge.registries.IForgeRegistryEntry;
import net.minecraftforge.registries.RegistryBuilder;
@Mod(modid = ObjectHolderTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*")
public class ObjectHolderTest
{
public static final String MODID = "objectholdertest";
public static IForgeRegistry registry;
@Mod.EventHandler
public void init(FMLInitializationEvent event)
@@ -64,7 +62,7 @@ public class ObjectHolderTest
public static void registerPotions(RegistryEvent.Register<Potion> event)
{
event.getRegistry().register(
new ObjectHolderTest.PotionForge(new ResourceLocation(ObjectHolderTest.MODID, "forge_potion"), false, 0xff00ff) // test automatic id distribution
new ObjectHolderTest.PotionForge(new ResourceLocation(ObjectHolderTest.MODID, "forge_potion"), false, 0xff00ff) // test automatic id distribution
);
}
@@ -72,68 +70,65 @@ public class ObjectHolderTest
public static void registerInterfaceRegistryForge(RegistryEvent.Register<ICustomRegistryEntry> event)
{
event.getRegistry().register(
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry_by_interface"))
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry_by_interface"))
);
event.getRegistry().register(
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry"))
new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry"))
);
}
}
}
interface ICustomRegistryEntry extends IForgeRegistryEntry<ICustomRegistryEntry>{}
class CustomRegistryEntry implements ICustomRegistryEntry
{
private ResourceLocation name;
@Override
public ICustomRegistryEntry setRegistryName(ResourceLocation name)
static class CustomRegistryEntry implements ICustomRegistryEntry
{
this.name = name;
return this;
private ResourceLocation name;
@Override
public ICustomRegistryEntry setRegistryName(ResourceLocation name)
{
this.name = name;
return this;
}
@Override
public ResourceLocation getRegistryName()
{
return name;
}
@Override
public Class<ICustomRegistryEntry> getRegistryType()
{
return ICustomRegistryEntry.class;
}
}
@Override
public ResourceLocation getRegistryName()
@GameRegistry.ObjectHolder("minecraft")
static class VanillaObjectHolder
{
return name;
//Tests importing vanilla objects that need the @ObjectHolder annotation to get a valid ResourceLocation
@GameRegistry.ObjectHolder("ui.button.click")
public static final SoundEvent uiButtonClick = null;
public static final Block air = null;
public static final Block nonExistentBlock = null;
}
@Override
public Class<ICustomRegistryEntry> getRegistryType()
@GameRegistry.ObjectHolder(ObjectHolderTest.MODID)
static class ForgeObjectHolder
{
return ICustomRegistryEntry.class;
//Tests using subclasses for injections
public static final ObjectHolderTest.PotionForge forge_potion = null;
}
@GameRegistry.ObjectHolder(ObjectHolderTest.MODID)
static class CustomRegistryObjectHolder
{
//Tests whether custom registries can be used
public static final ICustomRegistryEntry custom_entry = null;
//Tests whether interfaces can be used
public static final ICustomRegistryEntry custom_entry_by_interface = null;
}
}
interface ICustomRegistryEntry extends IForgeRegistryEntry<ICustomRegistryEntry>
{
}
@GameRegistry.ObjectHolder("minecraft")
class VanillaObjectHolder
{
//Tests importing vanilla objects that need the @ObjectHolder annotation to get a valid ResourceLocation
@GameRegistry.ObjectHolder("ui.button.click")
public static final SoundEvent uiButtonClick = null;
public static final Block air = null;
public static final Block nonExistentBlock = null;
}
@GameRegistry.ObjectHolder(ObjectHolderTest.MODID)
class ForgeObjectHolder
{
//Tests using subclasses for injections
public static final ObjectHolderTest.PotionForge forge_potion = null;
}
@GameRegistry.ObjectHolder(ObjectHolderTest.MODID)
class CustomRegistryObjectHolder
{
//Tests whether custom registries can be used
public static final ICustomRegistryEntry custom_entry = null;
//Tests whether interfaces can be used
public static final ICustomRegistryEntry custom_entry_by_interface = null;
}
@@ -8,9 +8,10 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.PotionType;
import net.minecraft.world.World;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,33 +24,43 @@ import java.util.List;
* 3. Drink incurable_potion from Brewing creative tab
* 4. Relog to test that changes to curative items persist, then try drinking milk and eating medicine: they should have no effect
*/
@Mod(modid = PotionCurativeItemDebug.MOD_ID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*")
@Mod(modid = PotionCurativeItemDebug.MODID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*")
public class PotionCurativeItemDebug
{
public static final boolean ENABLED = false;
public static final String MOD_ID = "potion_curative_item_debug";
public static final String MODID = "potion_curative_item_debug";
@ObjectHolder("medicine")
public static final Item MEDICINE = null;
private static Potion INCURABLE_POTION;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent evt)
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
if (!ENABLED)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
return;
if (!ENABLED) return;
event.getRegistry().register(new Medicine().setRegistryName(MODID, "medicine"));
}
@SubscribeEvent
public static void registerPotions(RegistryEvent.Register<Potion> event)
{
if (!ENABLED) return;
INCURABLE_POTION = new IncurablePotion().setRegistryName(MODID, "incurable_potion");
event.getRegistry().register(INCURABLE_POTION);
}
@SubscribeEvent
public static void registerPotionTypes(RegistryEvent.Register<PotionType> event)
{
if (!ENABLED) return;
// Register PotionType that can be cured with medicine
PotionEffect curable = new PotionEffect(INCURABLE_POTION, 1200);
curable.setCurativeItems(Collections.singletonList(new ItemStack(MEDICINE)));
event.getRegistry().register(new PotionType(curable).setRegistryName(MODID, "curable_potion_type"));
Item medicine = new Medicine().setRegistryName(MOD_ID, "medicine");
GameRegistry.register(medicine);
Potion incurablePotion = new IncurablePotion().setRegistryName(MOD_ID, "incurable_potion");
GameRegistry.register(incurablePotion);
// Register PotionType that can be cured with medicine
PotionEffect curable = new PotionEffect(incurablePotion, 1200);
curable.setCurativeItems(Collections.singletonList(new ItemStack(medicine)));
GameRegistry.register(new PotionType(curable).setRegistryName(MOD_ID, "curable_potion_type"));
// Register PotionType that can't be cured
GameRegistry.register(new PotionType(new PotionEffect(incurablePotion, 1200)).setRegistryName(MOD_ID, "incurable_potion_type"));
// Register PotionType that can't be cured
event.getRegistry().register(new PotionType(new PotionEffect(INCURABLE_POTION, 1200)).setRegistryName(MODID, "incurable_potion_type"));
}
}
private static class IncurablePotion extends Potion
@@ -15,7 +15,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.registries.GameData;
import java.util.Random;
@@ -27,10 +28,10 @@ public class PotionRegistryDebug
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
Potion forge = new PotionForge(new ResourceLocation(ForgeVersion.MOD_ID, "forge"), false, 0xff00ff); // test automatic id distribution
Potion forgy = new PotionForge(new ResourceLocation(ForgeVersion.MOD_ID, "forgy"), true, 0x00ff00); // test that ids above 127 work
GameData.getPotionRegistry().register(-1, new ResourceLocation(ForgeVersion.MOD_ID, "forge"), forge); //TODo: Generic this out in GameRegistry, 'RegistryEntry' base type?
GameData.getPotionRegistry().register(200, new ResourceLocation(ForgeVersion.MOD_ID, "forgy"), forgy);
Potion forge = new PotionForge(new ResourceLocation(ForgeVersion.MOD_ID, "forge"), false, 0xff00ff).setRegistryName(new ResourceLocation(ForgeVersion.MOD_ID, "forge")); // test automatic id distribution
Potion forgy = new PotionForge(new ResourceLocation(ForgeVersion.MOD_ID, "forgy"), true, 0x00ff00).setRegistryName(new ResourceLocation(ForgeVersion.MOD_ID, "forgy")); // test that ids above 127 work
ForgeRegistries.POTIONS.register(forge);
Potion.REGISTRY.register(200, forgy.getRegistryName(), forgy);
Random rand = new Random();
TIntSet taken = new TIntHashSet(100);
@@ -4,36 +4,56 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable;
@Mod(modid = TileEntityLoadingTest.MOD_ID, name = "TileEntity#onLoad() test mod", version = "1.0", acceptableRemoteVersions = "*")
@Mod(modid = TileEntityLoadingTest.MODID, name = "TileEntity#onLoad() test mod", version = "1.0", acceptableRemoteVersions = "*")
public class TileEntityLoadingTest
{
public static final boolean ENABLED = false;
static final String MOD_ID = "te_loading_test";
static final String MODID = "te_loading_test";
static final boolean DEBUG = false;
private static Logger logger;
private static final Block testBlock = new TestBlock();
@ObjectHolder(TestBlock.NAME)
private static final Block TEST_BLOCK = null;
@Mod.EventBusSubscriber(modid = MODID)
public static class Registration
{
@SubscribeEvent
public static void registerBlocks(RegistryEvent.Register<Block> event)
{
if (!ENABLED) return;
event.getRegistry().register(new TestBlock());
GameRegistry.registerTileEntity(TestTE.class, (new ResourceLocation(MODID, TestBlock.NAME)).toString());
}
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
if (!ENABLED) return;
event.getRegistry().register(new ItemBlock(TEST_BLOCK).setRegistryName(TEST_BLOCK.getRegistryName()));
}
}
@Mod.EventHandler
public static void preInit(FMLPreInitializationEvent event)
{
if (ENABLED)
{
logger = event.getModLog();
GameRegistry.register(testBlock);
GameRegistry.register(new ItemBlock(testBlock).setRegistryName(testBlock.getRegistryName()));
GameRegistry.registerTileEntity(TestTE.class, testBlock.getRegistryName().toString());
}
}
public static class TestBlock extends Block
@@ -44,7 +64,7 @@ public class TileEntityLoadingTest
{
super(Material.ANVIL);
setRegistryName(NAME);
setUnlocalizedName(MOD_ID + "." + NAME);
setUnlocalizedName(MODID + "." + NAME);
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
}
@@ -2,7 +2,6 @@ package net.minecraftforge.debug;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
@@ -15,58 +14,37 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = WrenchRotateDebug.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*")
public class WrenchRotateDebug
{
public static final String modID = "wrenchrotatedebug";
private static final ResourceLocation testWrenchName = new ResourceLocation(modID, "test_wrench");
@ObjectHolder("test_wrench")
public static final Item TEST_WRENCH = null;
@SidedProxy
public static CommonProxy proxy;
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
@Mod.EventBusSubscriber(modid = modID)
public static class Registration
{
TestWrench wrench = new TestWrench();
wrench.setRegistryName(testWrenchName);
GameRegistry.register(wrench);
proxy.setupModel(wrench);
}
public static class CommonProxy
{
void setupModel(TestWrench wrench)
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().register(new TestWrench().setRegistryName(testWrenchName));
}
}
public static class ServerProxy extends CommonProxy
{
}
public static class ClientProxy extends CommonProxy
{
@SuppressWarnings("unused")
@Override
void setupModel(TestWrench wrench)
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
final ModelResourceLocation wrenchName = new ModelResourceLocation(testWrenchName, "inventory");
ModelBakery.registerItemVariants(wrench, wrenchName);
ModelLoader.setCustomMeshDefinition(wrench, new ItemMeshDefinition()
{
@Override
public ModelResourceLocation getModelLocation(ItemStack stack)
{
return wrenchName;
}
});
ModelBakery.registerItemVariants(TEST_WRENCH, wrenchName);
ModelLoader.setCustomMeshDefinition(TEST_WRENCH, is -> wrenchName);
}
}
@@ -7,6 +7,8 @@ import net.minecraft.init.Bootstrap;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.registries.GameData;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -8,10 +8,18 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.ObjectHolderRegistry;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import com.google.common.collect.Maps;
import java.util.Map;
import java.util.Set;
import static org.junit.Assert.*;
@@ -44,48 +52,49 @@ public class DummyBlockReplacementTest
@Test
public void testDummyBlockReplacement()
{
final PersistentRegistryManager.GameDataSnapshot snapshot = PersistentRegistryManager.takeSnapshot();
PersistentRegistryManager.freezeData();
final Map<ResourceLocation, ForgeRegistry.Snapshot> snapshot = Maps.newHashMap();
GameData.freezeData();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
final FMLControlledNamespacedRegistry<Block> blockRegistry = (FMLControlledNamespacedRegistry<Block>) PersistentRegistryManager.findRegistryByType(Block.class);
final ForgeRegistry<Block> blockRegistry = (ForgeRegistry<Block>)RegistryManager.ACTIVE.getRegistry(Block.class);
Block fnd = blockRegistry.getValue(myDirt);
assertNotEquals("Didn't find my block", fnd, testDirtBlock);
assertEquals("Found a default air block", fnd, Blocks.AIR);
// Insert a dummy reference to my dirt
snapshot.entries.get(PersistentRegistryManager.BLOCKS).ids.put(myDirt, 218);
PersistentRegistryManager.injectSnapshot(snapshot, true, true);
snapshot.put(GameData.BLOCKS, new ForgeRegistry.Snapshot());
snapshot.get(GameData.BLOCKS).ids.put(myDirt, 218);
GameData.injectSnapshot(snapshot, true, true);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
assertNotEquals("Did not find my block", fnd, testDirtBlock);
assertTrue("Found a dummy air block", fnd.getClass().getName().endsWith("BlockDummyAir"));
final Set<ResourceLocation> dummied = PersistentRegistryManager.takeSnapshot().entries.get(PersistentRegistryManager.BLOCKS).dummied;
final Set<ResourceLocation> dummied = RegistryManager.ACTIVE.takeSnapshot(false).get(GameData.BLOCKS).dummied;
assertTrue("Found my block in the dummy list", dummied.contains(myDirt));
PersistentRegistryManager.revertToFrozen();
GameData.revertToFrozen();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
assertNotEquals("Did not find my block", fnd, testDirtBlock);
assertEquals("Found a default air block", fnd, Blocks.AIR);
GameRegistry.register(testDirtBlock, myDirt);
RegistryManager.ACTIVE.getRegistry(Block.class).register(testDirtBlock.setRegistryName(myDirt));
fnd = blockRegistry.getValue(myDirt);
assertEquals("Found my block", fnd, testDirtBlock);
// Add dummied entry in
snapshot.entries.get(PersistentRegistryManager.BLOCKS).dummied.add(myDirt);
snapshot.get(GameData.BLOCKS).dummied.add(myDirt);
// Loading locally - we should resuscitate our block
PersistentRegistryManager.injectSnapshot(snapshot, true, true);
GameData.injectSnapshot(snapshot, true, true);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
assertEquals("Found my block", fnd, testDirtBlock);
PersistentRegistryManager.revertToFrozen();
GameData.revertToFrozen();
// Sent remotely, we should NOT resuscitate our block
PersistentRegistryManager.injectSnapshot(snapshot, false, false);
GameData.injectSnapshot(snapshot, false, false);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
assertNotEquals("Did not find my block", fnd, testDirtBlock);
@@ -4,13 +4,24 @@ import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import net.minecraftforge.registries.RegistryBuilder;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import com.google.common.collect.Maps;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import java.util.Map;
/**
* Created by cpw on 04/07/16.
*/
@@ -24,7 +35,7 @@ public class FreezingTests
private static RTest r4;
private static RTest r5;
private static RTest r6;
private static PersistentRegistryManager.GameDataSnapshot ss;
private static Map<ResourceLocation, ForgeRegistry.Snapshot> ss;
static class RTest extends IForgeRegistryEntry.Impl<RTest>
{
@@ -42,67 +53,58 @@ public class FreezingTests
{
Loader.instance();
System.setProperty("fml.queryResult", "confirm");
System.setProperty("forge.disableVanillaGameData", "true");
registry = new RegistryBuilder<RTest>().setName(resloc).setType(RTest.class).setIDRange(0, 255).create();
new RegistryBuilder<Block>().setName(PersistentRegistryManager.BLOCKS).setType(Block.class).setIDRange(0, 255).create();
new RegistryBuilder<Item>().setName(PersistentRegistryManager.ITEMS).setType(Item.class).setIDRange(0, 255).create();
new RegistryBuilder<Block>().setName(GameData.BLOCKS).setType(Block.class).setIDRange(0, 255).create();
new RegistryBuilder<Item>().setName(GameData.ITEMS).setType(Item.class).setIDRange(0, 255).create();
r1 = new RTest("test1");
r2 = new RTest("test2");
r3 = new RTest("test3");
r4 = new RTest("test4");
r5 = new RTest("test5");
r6 = new RTest("test6");
ss = new PersistentRegistryManager.GameDataSnapshot();
ss.entries.put(PersistentRegistryManager.BLOCKS, new PersistentRegistryManager.GameDataSnapshot.Entry());
ss.entries.put(PersistentRegistryManager.ITEMS, new PersistentRegistryManager.GameDataSnapshot.Entry());
PersistentRegistryManager.findRegistryByType(RTest.class).register(r1);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r2);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r3);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r4);
ss.entries.put(resloc, new PersistentRegistryManager.GameDataSnapshot.Entry(PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class)));
PersistentRegistryManager.PersistentRegistry.ACTIVE.clean();
PersistentRegistryManager.PersistentRegistry.FROZEN.clean();
ss = Maps.newHashMap();
ss.put(GameData.BLOCKS, new ForgeRegistry.Snapshot());
ss.put(GameData.ITEMS, new ForgeRegistry.Snapshot());
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r1);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r2);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r3);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r4);
ss.put(resloc, ((ForgeRegistry<?>)RegistryManager.ACTIVE.getRegistry(RTest.class)).makeSnapshot());
RegistryManager.ACTIVE.clean();
RegistryManager.FROZEN.clean();
registry = new RegistryBuilder<RTest>().setName(resloc).setType(RTest.class).setIDRange(0, 255).create();
new RegistryBuilder<Block>().setName(PersistentRegistryManager.BLOCKS).setType(Block.class).setIDRange(0, 255).create();
new RegistryBuilder<Item>().setName(PersistentRegistryManager.ITEMS).setType(Item.class).setIDRange(0, 255).create();
new RegistryBuilder<Block>().setName(GameData.BLOCKS).setType(Block.class).setIDRange(0, 255).create();
new RegistryBuilder<Item>().setName(GameData.ITEMS).setType(Item.class).setIDRange(0, 255).create();
}
@Test
public void testFreezeCycle()
{
PersistentRegistryManager.findRegistryByType(RTest.class).register(r6);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r5);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r4);
PersistentRegistryManager.findRegistryByType(RTest.class).register(r3);
FMLControlledNamespacedRegistry<RTest> r = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistry(r3);
int r3id = r.getId(r3);
PersistentRegistryManager.freezeData();
RTest q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Frozen object is the same", r3, q1);
q1 = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Active object is the same", r3, q1);
PersistentRegistryManager.injectSnapshot(ss, false, false);
assertNotEquals("IDs don't match", r3id, r.getId(r3));
q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Frozen object is the same", r3, q1);
q1 = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Active object is the same", r3, q1);
PersistentRegistryManager.revertToFrozen();
assertEquals("IDs match", r3id, r.getId(r3));
q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Frozen object is the same", r3, q1);
q1 = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Active object is the same", r3, q1);
PersistentRegistryManager.injectSnapshot(ss, true, true);
assertNotEquals("IDs don't match", r3id, r.getId(r3));
q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Frozen object is the same", r3, q1);
q1 = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Active object is the same", r3, q1);
PersistentRegistryManager.revertToFrozen();
assertEquals("IDs match", r3id, r.getId(r3));
q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Frozen object is the same", r3, q1);
q1 = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3"));
assertEquals("Active object is the same", r3, q1);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r6);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r5);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r4);
RegistryManager.ACTIVE.getRegistry(RTest.class).register(r3);
ForgeRegistry<RTest> r = (ForgeRegistry<RTest>)RegistryManager.ACTIVE.getRegistry(r3.getRegistryType());
int r3id = r.getID(r3);
GameData.freezeData();
assertEquals("Frozen object is the same", r3, RegistryManager.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
assertEquals("Active object is the same", r3, RegistryManager.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
GameData.injectSnapshot(ss, false, false);
assertNotEquals("IDs don't match", r3id, r.getID(r3));
assertEquals("Frozen object is the same", r3, RegistryManager.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
assertEquals("Active object is the same", r3, RegistryManager.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
GameData.revertToFrozen();
assertEquals("IDs match", r3id, r.getID(r3));
assertEquals("Frozen object is the same", r3, RegistryManager.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
assertEquals("Active object is the same", r3, RegistryManager.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
GameData.injectSnapshot(ss, true, true);
assertNotEquals("IDs don't match", r3id, r.getID(r3));
assertEquals("Frozen object is the same", r3, RegistryManager.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
assertEquals("Active object is the same", r3, RegistryManager.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
GameData.revertToFrozen();
assertEquals("IDs match", r3id, r.getID(r3));
assertEquals("Frozen object is the same", r3, RegistryManager.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
assertEquals("Active object is the same", r3, RegistryManager.ACTIVE.getRegistry(RTest.class).getValue(new ResourceLocation("test3")));
}
}
@@ -1,5 +1,6 @@
package net.minecraftforge.fml.common.registry;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDirt;
import net.minecraft.init.Blocks;
import net.minecraft.init.Bootstrap;
@@ -11,6 +12,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.ObjectHolderRegistry;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -20,6 +26,8 @@ import javax.annotation.Nonnull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import java.util.Map;
/**
* Substitution test harness - tests that substitutions behave correctly
*/
@@ -62,28 +70,30 @@ public class ItemBlockSubstitutionRemoveRestoreTest
@Test
public void testSubstitutionRemovalAndRestore() throws Exception
{
GameRegistry.addSubstitutionAlias("minecraft:dirt", GameRegistry.Type.ITEM, myDirtInstance);
PersistentRegistryManager.freezeData();
RegistryManager.ACTIVE.getRegistry(Item.class).register(myDirtInstance.setRegistryName(myDirt));
GameData.freezeData();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
final FMLControlledNamespacedRegistry<Item> itemRegistry = (FMLControlledNamespacedRegistry<Item>) PersistentRegistryManager.findRegistryByType(Item.class);
final ForgeRegistry<Item> itemRegistry = (ForgeRegistry<Item>)RegistryManager.ACTIVE.getRegistry(Item.class);
// TEST 1: Does my substitute take effect? The substitute should be found in the registry
ItemBlock dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", myDirtInstance, dirtitem);
// TEST 2: Does the substitute get removed when told by remote operation? The substitute should NOT be found in the registry
final PersistentRegistryManager.GameDataSnapshot snapshot = PersistentRegistryManager.takeSnapshot();
snapshot.entries.get(PersistentRegistryManager.ITEMS).substitutions.clear();
PersistentRegistryManager.injectSnapshot(snapshot, false, false);
/* Why should it not be found? Substitutions are no longer special cases
Map<ResourceLocation, ForgeRegistry.Snapshot> snapshot = RegistryManager.ACTIVE.takeSnapshot(false);
snapshot.get(GameData.ITEMS).substitutions.clear();
GameData.injectSnapshot(snapshot, false, false);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
*/
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at vanilla block", originalDirt, dirtitem);
assertNotEquals("ItemBlock points at my block", myDirtInstance, dirtitem);
// TEST 3: Does the substitute get restored when reverting to frozen state? The substitute should be found in the registry again
PersistentRegistryManager.revertToFrozen();
GameData.revertToFrozen();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", myDirtInstance, dirtitem);
@@ -11,6 +11,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.ObjectHolderRegistry;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -20,14 +25,16 @@ import javax.annotation.Nonnull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.util.Map;
/**
* Substitution test harness - tests that substitutions behave correctly
*/
@RunWith(ForgeTestRunner.class)
public class SubstitutionInjectionTest
{
private ResourceLocation myDirt = new ResourceLocation("minecraft:dirt");
private BlockDirt toSub = new BlockDirt()
private ResourceLocation MC_DIRT = new ResourceLocation("minecraft:dirt");
private Block toSub = (new BlockDirt()
{
@Override
@Nonnull
@@ -35,7 +42,7 @@ public class SubstitutionInjectionTest
{
return "SUB" + super.toString() + "SUB";
}
};
}).setRegistryName(MC_DIRT);
@BeforeClass
public static void setup()
@@ -51,23 +58,24 @@ public class SubstitutionInjectionTest
@Test
public void testSubstitutionInjection() throws Exception
{
final FMLControlledNamespacedRegistry<Block> blockRegistry = (FMLControlledNamespacedRegistry<Block>) PersistentRegistryManager.findRegistryByType(Block.class);
final FMLControlledNamespacedRegistry<Item> itemRegistry = (FMLControlledNamespacedRegistry<Item>) PersistentRegistryManager.findRegistryByType(Item.class);
final ForgeRegistry<Block> blockRegistry = (ForgeRegistry<Block>)RegistryManager.ACTIVE.getRegistry(Block.class);
final ForgeRegistry<Item> itemRegistry = (ForgeRegistry<Item>)RegistryManager.ACTIVE.getRegistry(Item.class);
// Capture snapshot prior to registering the substitution - this is a world state "pre-substitute"
final PersistentRegistryManager.GameDataSnapshot snapshot = PersistentRegistryManager.takeSnapshot();
final Map<ResourceLocation, ForgeRegistry.Snapshot> snapshot = RegistryManager.ACTIVE.takeSnapshot(false);
Block fnd = blockRegistry.getValue(myDirt);
Block fnd = blockRegistry.getValue(MC_DIRT);
Block vanilDirt = Blocks.DIRT;
Block currDirt = Blocks.DIRT;
// TEST 0: Verify that input state is correct
assertEquals("Got vanilla dirt ", currDirt, fnd);
// TEST 0a: Validate that the ItemBlock for Dirt points at vanilla dirt
ItemBlock dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
ItemBlock dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at my block", currDirt, dirtitem.block);
GameRegistry.addSubstitutionAlias("minecraft:dirt", GameRegistry.Type.BLOCK, toSub);
PersistentRegistryManager.freezeData();
blockRegistry.register(toSub); //Register a new object, with the same vanilla name, Should cause the item to be replaced
GameData.freezeData();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
// This should not throw an exception
try
@@ -80,61 +88,58 @@ public class SubstitutionInjectionTest
}
// TEST 1: Does my substitute take effect? The substitute should be found in the registry
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
assertEquals("Got vanilla dirt - Blocks", toSub, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got vanilla dirt - registry", toSub, fnd);
// TEST 1a: Validate that the ItemBlock for Dirt now points at my dirt
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at vanilla block", toSub, dirtitem.getBlock());
// TEST 2: Does the substitute get injected when told by loading operation? The substitute should be found in the registry
PersistentRegistryManager.injectSnapshot(snapshot, true, true);
// TEST 2: Is the substitute still in the registry? The snapshot was taken before the substitute was added so it should NOT exist
GameData.injectSnapshot(snapshot, true, true);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
assertEquals("Got my dirt substitute - Blocks", vanilDirt, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", vanilDirt, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at my block", toSub, dirtitem.getBlock());
// TEST 3: Does the substitute get restored when reverting to frozen state? The substitute should be found in the registry again
PersistentRegistryManager.revertToFrozen();
GameData.revertToFrozen();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
assertEquals("Got vanilla dirt - Blocks", toSub, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got vanilla dirt - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at vanilla block", toSub, dirtitem.getBlock());
// TEST 2 repeat: Does the substitute get injected when told by loading operation? The substitute should be found in the registry
PersistentRegistryManager.injectSnapshot(snapshot, true, true);
// TEST 2 repeat: Is the substitute still in the registry? The snapshot was taken before the substitute was added so it should NOT exist
GameData.injectSnapshot(snapshot, true, true);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
assertEquals("Got my dirt substitute - Blocks", vanilDirt, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", vanilDirt, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at my block", toSub, dirtitem.getBlock());
// TEST 3 repeat: Does the substitute get restored when reverting to frozen state? The substitute should be found in the registry again
PersistentRegistryManager.revertToFrozen();
GameData.revertToFrozen();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
assertEquals("Got vanilla dirt - Blocks", toSub, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got vanilla dirt - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at vanilla block", toSub, dirtitem.getBlock());
}
}
@@ -10,6 +10,11 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.DummyModContainer;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModMetadata;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.ObjectHolderRegistry;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -17,17 +22,16 @@ import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import java.util.Map;
/**
* Substitution test harness - tests that substitutions behave correctly
*/
@RunWith(ForgeTestRunner.class)
public class SubstitutionRemoveRestoreTest
{
private ResourceLocation myDirt = new ResourceLocation("minecraft:dirt");
private BlockDirt toSub = new BlockDirt()
{
};
private ResourceLocation MC_DIRT = new ResourceLocation("minecraft:dirt");
private Block toSub = (new BlockDirt(){}).setRegistryName(MC_DIRT);
@BeforeClass
public static void setup()
@@ -43,48 +47,53 @@ public class SubstitutionRemoveRestoreTest
@Test
public void testSubstitutionRemovalAndRestore() throws Exception
{
GameRegistry.addSubstitutionAlias("minecraft:dirt", GameRegistry.Type.BLOCK, toSub);
PersistentRegistryManager.freezeData();
/* TODO: Figure this one out, We dont prevent the client from loading subs when the server says not to..
* Why should we as long as the item is on both sides we should be fine. It's on the modder to make sure they are compatible.
*
final ForgeRegistry<Block> blockRegistry = (ForgeRegistry<Block>)RegistryManager.ACTIVE.getRegistry(Block.class);
final ForgeRegistry<Item> itemRegistry = (ForgeRegistry<Item>)RegistryManager.ACTIVE.getRegistry(Item.class);
Block vanilla = blockRegistry.getValue(MC_DIRT);
blockRegistry.register(toSub);
GameData.freezeData();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
final FMLControlledNamespacedRegistry<Block> blockRegistry = (FMLControlledNamespacedRegistry<Block>) PersistentRegistryManager.findRegistryByType(Block.class);
final FMLControlledNamespacedRegistry<Item> itemRegistry = (FMLControlledNamespacedRegistry<Item>) PersistentRegistryManager.findRegistryByType(Item.class);
// TEST 1: Does my substitute take effect? The substitute should be found in the registry
Block fnd = blockRegistry.getValue(myDirt);
Block fnd = blockRegistry.getValue(MC_DIRT);
Block currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
ItemBlock dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
assertEquals("Got Vanilla Dirt - Blocks", toSub, currDirt);
assertEquals("ObjectHolder didn't apply - Blocks and registry", currDirt, fnd);
assertEquals("Got Vanilla Dirt - registry", toSub, fnd);
ItemBlock dirtitem = (ItemBlock)itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at my block", toSub, dirtitem.getBlock());
// TEST 2: Does the substitute get removed when told by remote operation? The substitute should NOT be found in the registry
final PersistentRegistryManager.GameDataSnapshot snapshot = PersistentRegistryManager.takeSnapshot();
final Map<ResourceLocation, ForgeRegistry.Snapshot> snapshot = RegistryManager.ACTIVE.takeSnapshot(false);
snapshot.entries.get(PersistentRegistryManager.BLOCKS).substitutions.clear();
PersistentRegistryManager.injectSnapshot(snapshot, false, false);
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertNotEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertNotEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at vanilla block", currDirt, dirtitem.block);
assertNotEquals("ItemBlock points at my block", toSub, dirtitem.block);
// TEST 3: Does the substitute get restored when reverting to frozen state? The substitute should be found in the registry again
PersistentRegistryManager.revertToFrozen();
ObjectHolderRegistry.INSTANCE.applyObjectHolders();
fnd = blockRegistry.getValue(myDirt);
fnd = blockRegistry.getValue(MC_DIRT);
currDirt = Blocks.DIRT;
assertEquals("Got my dirt substitute - Blocks", toSub, currDirt);
assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd);
assertEquals("Got my dirt substitute - registry", toSub, fnd);
dirtitem = (ItemBlock) itemRegistry.getValue(myDirt);
dirtitem = (ItemBlock) itemRegistry.getValue(MC_DIRT);
assertEquals("ItemBlock points at my block", toSub, dirtitem.block);
*/
}
}
@@ -8,6 +8,10 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.RegistryManager;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +41,7 @@ public class VanillaRegistryTests
assertEquals("We have all the items via GameData", 411, Item.REGISTRY.getKeys().size());
// Our lookups find the same stuff vanilla sees
final IForgeRegistry<Block> blocks = PersistentRegistryManager.findRegistry(Blocks.AIR);
final IForgeRegistry<Block> blocks = RegistryManager.ACTIVE.getRegistry(Block.class);
assertEquals("We have the right blocks for a block", blocks, Block.REGISTRY);
// We can look up stuff through our APIs
@@ -49,7 +53,7 @@ public class VanillaRegistryTests
assertEquals("We got air when we asked for cheese", Blocks.AIR, blch);
// Our lookups find the same stuff vanilla sees
final IForgeRegistry<Item> items = PersistentRegistryManager.findRegistry(Items.BED);
final IForgeRegistry<Item> items = RegistryManager.ACTIVE.getRegistry(Item.class);
assertEquals("We have the right items for an item", items, Item.REGISTRY);
// We can look up stuff through our APIs
@@ -64,13 +68,12 @@ public class VanillaRegistryTests
@Test
public void testRegistration()
{
Block myBlock = GameRegistry.register(new Block(Material.CAKE)
{
}, new ResourceLocation("minecraft:testy"));
final IForgeRegistry<Block> blocks = RegistryManager.ACTIVE.getRegistry(Block.class);
Block myBlock = (new Block(Material.CAKE){}).setRegistryName(new ResourceLocation("minecraft:testy"));
blocks.register(myBlock);
assertNotNull("Registered my block", myBlock);
// Our lookups find the same stuff vanilla sees
final IForgeRegistry<Block> blocks = PersistentRegistryManager.findRegistry(myBlock);
assertEquals("We have the right blocks for a block", blocks, Block.REGISTRY);
Block found = blocks.getValue(new ResourceLocation("minecraft:testy"));
@@ -80,8 +83,8 @@ public class VanillaRegistryTests
@Test
public void testRegistryStates()
{
final FMLControlledNamespacedRegistry<Block> blockVanilla = PersistentRegistryManager.PersistentRegistry.VANILLA.getRegistry(Block.class);
final FMLControlledNamespacedRegistry<Block> blockActive = PersistentRegistryManager.PersistentRegistry.ACTIVE.getRegistry(Block.class);
final ForgeRegistry<Block> blockVanilla = (ForgeRegistry<Block>)RegistryManager.VANILLA.getRegistry(Block.class);
final ForgeRegistry<Block> blockActive = (ForgeRegistry<Block>)RegistryManager.ACTIVE.getRegistry(Block.class);
assertNotEquals("Registry states are distinct", blockActive, blockVanilla);
@@ -90,8 +93,8 @@ public class VanillaRegistryTests
assertEquals("Stone from active and vanilla are the same", stoneActive, stoneVanilla);
int activeId = blockActive.getId(stoneActive);
int vanillaId = blockVanilla.getId(stoneVanilla);
int activeId = blockActive.getID(stoneActive);
int vanillaId = blockVanilla.getID(stoneVanilla);
assertEquals("Stone has correct id", 1, activeId);
assertEquals("Stone has correct id", 1, vanillaId);