keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix more test mod warnings (#4477)

This commit is contained in:
Ben Staddon 2017-11-03 06:29:31 +00:00 committed by mezz
parent dd69f0623c
commit 6192bf48ae
8 changed files with 116 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java
View File

@ -3,18 +3,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.block.model.ModelBakery;
import net.minecraft.item.Item;
import net.minecraft.pathfinding.PathNodeType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
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.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = "ainodetypetest", name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*")
import java.util.Collections;
@Mod(modid = BlockAiNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber
public class BlockAiNodeTypeTest
{
public static final boolean ENABLED = false;
static final String MOD_ID = "ai_node_type_test";
static final boolean ENABLED = false;
private static final Block TEST_BLOCK = new TestBlock();
@SubscribeEvent
@ -26,13 +35,26 @@ public class BlockAiNodeTypeTest
}
}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler
{
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (ENABLED)
{
ModelLoader.setCustomStateMapper(TEST_BLOCK, block -> Collections.emptyMap());
ModelBakery.registerItemVariants(Item.getItemFromBlock(TEST_BLOCK));
}
}
}
private static final class TestBlock extends Block
{
TestBlock()
{
super(Material.ROCK);
setRegistryName("testblock");
setRegistryName("test_block");
}
@Override
@ -41,5 +63,4 @@ public class BlockAiNodeTypeTest
return PathNodeType.DOOR_OPEN;
}
}
}

27
src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java
View File

@ -1,17 +1,20 @@
package net.minecraftforge.debug;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.init.Enchantments;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = CanApplyAtEnchantingTableTest.MODID, name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class CanApplyAtEnchantingTableTest
{
public static final String MODID = "canapplyatenchantingtabletest";
public static final String MODID = "can_apply_at_enchanting_table_test";
public static final boolean ENABLE = false;
public static final Item testItem = new Item()
@ -39,10 +42,28 @@ public class CanApplyAtEnchantingTableTest
public static class Registration
{
@SubscribeEvent
public static void registrItems(RegistryEvent.Register<Item> event)
public static void registerItems(RegistryEvent.Register<Item> event)
{
if (ENABLE)
event.getRegistry().register(testItem.setRegistryName("test_item").setUnlocalizedName("FortuneEnchantableOnly").setMaxStackSize(1));
{
event.getRegistry().register(
testItem.setRegistryName("test_item")
.setUnlocalizedName("FortuneEnchantableOnly")
.setMaxStackSize(1));
}
}
}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler
{
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (ENABLE)
{
ModelBakery.registerItemVariants(testItem);
}
}
}
}

16
src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java
View File

@ -1,12 +1,15 @@
package net.minecraftforge.debug;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber
@ -26,6 +29,19 @@ public class IsBookEnchantableTest
}
}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler
{
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (ENABLED)
{
ModelBakery.registerItemVariants(TEST_ITEM);
}
}
}
private static class TestItem extends Item
{
private static final String NAME = "test_item";

29
src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java
View File

@ -80,6 +80,8 @@ public class ModelAnimationDebug
public static final String rotateBlockName = "rotatest";
@ObjectHolder(rotateBlockName)
public static final Block TEST_ROTATE_BLOCK = null;
@ObjectHolder(rotateBlockName)
public static final Item TEST_ROTATE_ITEM = null;
@Instance(MODID)
public static ModelAnimationDebug instance;
@ -287,6 +289,7 @@ public class ModelAnimationDebug
chest.handleEvents(time, pastEvents);
}
});
ModelLoader.setCustomModelResourceLocation(TEST_ROTATE_ITEM, 0, new ModelResourceLocation(TEST_ROTATE_ITEM.getRegistryName(), "inventory"));
ClientRegistry.bindTileEntitySpecialRenderer(Spin.class, new AnimationTESR<Spin>());
String entityName = MODID + ":entity_chest";
//EntityRegistry.registerGlobalEntityID(EntityChest.class, entityName, EntityRegistry.findGlobalUniqueEntityId());
@ -357,29 +360,19 @@ public class ModelAnimationDebug
logger = event.getModLog();
}
public static class Spin extends TileEntity implements ITickable, ICapabilityProvider {
public static class Spin extends TileEntity
{
@Nullable
private final IAnimationStateMachine asm;
private final VariableValue cycle = new VariableValue(0);
public Spin() {
asm = proxy.load(new ResourceLocation(MODID, "asms/block/rotatest.json"), ImmutableMap.<String, ITimeValue>of("cycle", cycle));
}
int tickcounter;
@Override
public void update() {
tickcounter++;
if (world.isRemote) {
cycle.setValue(tickcounter/40.0F);
}
public Spin()
{
asm = proxy.load(new ResourceLocation(MODID, "asms/block/rotatest.json"), ImmutableMap.of());
}
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing side) {
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing side)
{
return capability == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(capability, side);
}
@ -387,7 +380,7 @@ public class ModelAnimationDebug
@Nullable
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing side)
{
if(capability == CapabilityAnimation.ANIMATION_CAPABILITY)
if (capability == CapabilityAnimation.ANIMATION_CAPABILITY)
{
return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm);
}

17
src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java
View File

@ -1,5 +1,6 @@
package net.minecraftforge.debug;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
@ -8,10 +9,12 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.PotionType;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.fml.relauncher.Side;
import java.util.ArrayList;
import java.util.Collections;
@ -29,6 +32,7 @@ public class PotionCurativeItemDebug
{
public static final boolean ENABLED = false;
public static final String MODID = "potion_curative_item_debug";
@ObjectHolder("medicine")
public static final Item MEDICINE = null;
private static Potion INCURABLE_POTION;
@ -42,6 +46,7 @@ public class PotionCurativeItemDebug
if (!ENABLED) return;
event.getRegistry().register(new Medicine().setRegistryName(MODID, "medicine"));
}
@SubscribeEvent
public static void registerPotions(RegistryEvent.Register<Potion> event)
{
@ -49,6 +54,7 @@ public class PotionCurativeItemDebug
INCURABLE_POTION = new IncurablePotion().setRegistryName(MODID, "incurable_potion");
event.getRegistry().register(INCURABLE_POTION);
}
@SubscribeEvent
public static void registerPotionTypes(RegistryEvent.Register<PotionType> event)
{
@ -63,6 +69,17 @@ public class PotionCurativeItemDebug
}
}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler
{
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (!ENABLED) return;
ModelBakery.registerItemVariants(MEDICINE);
}
}
private static class IncurablePotion extends Potion
{
protected IncurablePotion()

18
src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java
View File

@ -3,22 +3,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.block.model.ModelBakery;
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.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.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.fml.relauncher.Side;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable;
import java.util.Collections;
@Mod(modid = TileEntityLoadingTest.MODID, name = "TileEntity#onLoad() test mod", version = "1.0", acceptableRemoteVersions = "*")
public class TileEntityLoadingTest
@ -41,6 +46,7 @@ public class TileEntityLoadingTest
event.getRegistry().register(new TestBlock());
GameRegistry.registerTileEntity(TestTE.class, (new ResourceLocation(MODID, TestBlock.NAME)).toString());
}
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event)
{
@ -49,6 +55,18 @@ public class TileEntityLoadingTest
}
}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler
{
@SubscribeEvent
public static void registerModels(ModelRegistryEvent event)
{
if (!ENABLED) return;
ModelLoader.setCustomStateMapper(TEST_BLOCK, block -> Collections.emptyMap());
ModelBakery.registerItemVariants(Item.getItemFromBlock(TEST_BLOCK));
}
}
@Mod.EventHandler
public static void preInit(FMLPreInitializationEvent event)
{

2
src/test/resources/assets/forgedebugmodelanimation/asms/block/rotatest.json
View File

@ -1,6 +1,6 @@
{
"parameters": {
"cycle": ["/", 2.0]
},
"clips": {
"default": ["apply", "forgedebugmodelanimation:block/rotatest@default", "#cycle" ]

4
src/test/resources/assets/forgedebugmodelanimation/blockstates/rotatest.json
View File

@ -1,10 +1,12 @@
{
"forge_marker": 1,
"defaults": {
"model": "forgedebugmodelanimation:rotatest"
"model": "forgedebugmodelanimation:rotatest",
"transform": "forge:default-block"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"static": {
"true": {},
"false": {}