diff --git a/src/test/java/net/minecraftforge/test/AnimalTameEventTest.java b/src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java similarity index 80% rename from src/test/java/net/minecraftforge/test/AnimalTameEventTest.java rename to src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java index b11ed5cf8b..a0487f410e 100644 --- a/src/test/java/net/minecraftforge/test/AnimalTameEventTest.java +++ b/src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java @@ -1,11 +1,11 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.entity.passive.EntityWolf; import net.minecraftforge.event.entity.living.AnimalTameEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0") +@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber public class AnimalTameEventTest { @@ -15,7 +15,10 @@ public class AnimalTameEventTest @SubscribeEvent public static void onAnimalTame(AnimalTameEvent event) { - if (!ENABLED) return; + if (!ENABLED) + { + return; + } if (event.getAnimal() instanceof EntityWolf) { diff --git a/src/test/java/net/minecraftforge/test/BlockAiNodeTypeTest.java b/src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java similarity index 70% rename from src/test/java/net/minecraftforge/test/BlockAiNodeTypeTest.java rename to src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java index b265445e0f..b66fe42ea5 100644 --- a/src/test/java/net/minecraftforge/test/BlockAiNodeTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java @@ -1,6 +1,4 @@ -package net.minecraftforge.test; - -import javax.annotation.Nullable; +package net.minecraftforge.debug; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,30 +8,33 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; 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; -@Mod(modid = "ainodetypetest", name="AiNodeTypeTest", version = "1.0") +@Mod(modid = "ainodetypetest", name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber public class BlockAiNodeTypeTest { - + public static final boolean ENABLED = false; private static final Block TEST_BLOCK = new TestBlock(); @SubscribeEvent public static void register(RegistryEvent.Register event) { - event.getRegistry().register(TEST_BLOCK); + if (ENABLED) + { + event.getRegistry().register(TEST_BLOCK); + } } - private static final class TestBlock extends Block { + private static final class TestBlock extends Block + { - TestBlock() { + TestBlock() + { super(Material.ROCK); setRegistryName("testblock"); } - @Nullable @Override public PathNodeType getAiPathNodeType(IBlockState state, IBlockAccess world, BlockPos pos) { diff --git a/src/test/java/net/minecraftforge/test/BlockPlaceEventTest.java b/src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java similarity index 82% rename from src/test/java/net/minecraftforge/test/BlockPlaceEventTest.java rename to src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java index 918c3d67e3..9f832f4605 100644 --- a/src/test/java/net/minecraftforge/test/BlockPlaceEventTest.java +++ b/src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java @@ -1,11 +1,11 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.init.Blocks; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = BlockPlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0") +@Mod(modid = BlockPlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber public class BlockPlaceEventTest { @@ -15,7 +15,10 @@ public class BlockPlaceEventTest @SubscribeEvent public static void onBlockPlaced(BlockEvent.PlaceEvent event) { - if (!ENABLED) return; + if (!ENABLED) + { + return; + } if (event.getPlacedBlock().getBlock() == Blocks.CHEST && event.getPlacedAgainst().getBlock() != Blocks.DIAMOND_BLOCK) diff --git a/src/test/java/net/minecraftforge/debug/BonemealEventTest.java b/src/test/java/net/minecraftforge/debug/BonemealEventTest.java index 0273bf69b9..baa3969fe8 100644 --- a/src/test/java/net/minecraftforge/debug/BonemealEventTest.java +++ b/src/test/java/net/minecraftforge/debug/BonemealEventTest.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = BonemealEventTest.MODID, version = "1.0") +@Mod(modid = BonemealEventTest.MODID, name = "Bonemeal Event Test", version = "1.0", acceptableRemoteVersions = "*") public class BonemealEventTest { public static final String MODID = "bonemealeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/BreedingTest.java b/src/test/java/net/minecraftforge/debug/BreedingTest.java index c73e50ba71..8eac5d0fbb 100644 --- a/src/test/java/net/minecraftforge/debug/BreedingTest.java +++ b/src/test/java/net/minecraftforge/debug/BreedingTest.java @@ -10,15 +10,17 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = BreedingTest.MODID, name = "BreedingTest", version = "1.0", acceptableRemoteVersions = "*") public class BreedingTest { - public static final String MODID = "breedingtest"; + public static final String MODID = "breedingtest"; - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - MinecraftForge.EVENT_BUS.register(this); - } + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) + { + MinecraftForge.EVENT_BUS.register(this); + } - @SubscribeEvent - public void onBabyBorn(BabyEntitySpawnEvent event) { - event.setChild(new EntityCow(event.getParentA().world)); - } + @SubscribeEvent + public void onBabyBorn(BabyEntitySpawnEvent event) + { + event.setChild(new EntityCow(event.getParentA().world)); + } } diff --git a/src/test/java/net/minecraftforge/test/BrewingRecipeRegistryTest.java b/src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java similarity index 59% rename from src/test/java/net/minecraftforge/test/BrewingRecipeRegistryTest.java rename to src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java index 16d8d62749..015246fa65 100644 --- a/src/test/java/net/minecraftforge/test/BrewingRecipeRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -6,35 +6,52 @@ import net.minecraftforge.common.brewing.BrewingRecipeRegistry; 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.event.FMLPreInitializationEvent; +import org.apache.logging.log4j.Logger; -@Mod(modid="brewingreciperegistrytest", name="BrewingRecipeRegistryTest", version="0.0.0", acceptableRemoteVersions = "*") +@Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*") public class BrewingRecipeRegistryTest { - public static final boolean ENABLE = false; + private static Logger logger; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + logger = event.getModLog(); + } @EventHandler public void init(FMLInitializationEvent event) { - if(!ENABLE) return; + if (!ENABLE) + { + return; + } // The following adds a recipe that brews a piece of rotten flesh "into" a diamond sword resulting in a diamond hoe BrewingRecipeRegistry.addRecipe(new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.ROTTEN_FLESH), new ItemStack(Items.DIAMOND_HOE)); ItemStack output0 = BrewingRecipeRegistry.getOutput(new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.ROTTEN_FLESH)); - if(output0.getItem() == Items.DIAMOND_HOE) - System.out.println("Recipe succefully registered and working. Diamond Hoe obtained."); + if (output0.getItem() == Items.DIAMOND_HOE) + { + logger.info("Recipe successfully registered and working. Diamond Hoe obtained."); + } // Testing if OreDictionary support is working. Register a recipe that brews a gemDiamond into a gold sword resulting in a diamond sword BrewingRecipeRegistry.addRecipe(new ItemStack(Items.GOLDEN_SWORD), "gemDiamond", new ItemStack(Items.DIAMOND_SWORD)); ItemStack output1 = BrewingRecipeRegistry.getOutput(new ItemStack(Items.GOLDEN_SWORD), new ItemStack(Items.DIAMOND)); - if(output1.getItem() == Items.DIAMOND_SWORD) - System.out.println("Recipe succefully registered and working. Diamond Sword obtained."); + if (output1.getItem() == Items.DIAMOND_SWORD) + { + logger.info("Recipe successfully registered and working. Diamond Sword obtained."); + } // In vanilla, brewing netherwart into a water bottle results in an awkward potion (with metadata 16). The following tests if that still happens ItemStack output2 = BrewingRecipeRegistry.getOutput(new ItemStack(Items.POTIONITEM, 1, 0), new ItemStack(Items.NETHER_WART)); - if(output2 != null && output2.getItem() == Items.POTIONITEM && output2.getItemDamage() == 16) - System.out.println("Vanilla behaviour still in place. Brewed Water Bottle with Nether Wart and got Awkward Potion"); + if (output2 != null && output2.getItem() == Items.POTIONITEM && output2.getItemDamage() == 16) + { + logger.info("Vanilla behaviour still in place. Brewed Water Bottle with Nether Wart and got Awkward Potion"); + } } } diff --git a/src/test/java/net/minecraftforge/test/CanApplyAtEnchantingTableTest.java b/src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java similarity index 77% rename from src/test/java/net/minecraftforge/test/CanApplyAtEnchantingTableTest.java rename to src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java index 3984142465..f0e03c7fc7 100644 --- a/src/test/java/net/minecraftforge/test/CanApplyAtEnchantingTableTest.java +++ b/src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Enchantments; @@ -8,14 +8,15 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid="canapplyatenchantingtabletest", name="CanApplyAtEnchantingTableTest", version="0.0.0") +@Mod(modid = "canapplyatenchantingtabletest", name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*") public class CanApplyAtEnchantingTableTest { - public static final boolean ENABLE = true; + public static final boolean ENABLE = false; public static final Item testItem = new Item() { - public boolean isItemTool(ItemStack stack) + @Override + public boolean isEnchantable(ItemStack stack) { return true; } @@ -36,7 +37,7 @@ public class CanApplyAtEnchantingTableTest @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - if(ENABLE) + if (ENABLE) { GameRegistry.register(testItem.setRegistryName("test_item").setUnlocalizedName("FortuneEnchantableOnly").setMaxStackSize(1)); } diff --git a/src/test/java/net/minecraftforge/test/ClientChatEventTest.java b/src/test/java/net/minecraftforge/debug/ClientChatEventTest.java similarity index 65% rename from src/test/java/net/minecraftforge/test/ClientChatEventTest.java rename to src/test/java/net/minecraftforge/debug/ClientChatEventTest.java index d6c5437924..4b8e654bc4 100644 --- a/src/test/java/net/minecraftforge/test/ClientChatEventTest.java +++ b/src/test/java/net/minecraftforge/debug/ClientChatEventTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.common.MinecraftForge; @@ -7,8 +7,9 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid="clientchateventtest", name="Client Chat Event Test", version="0.0.0", acceptableRemoteVersions = "*") -public class ClientChatEventTest { +@Mod(modid = "clientchateventtest", name = "Client Chat Event Test", version = "0.0.0", clientSideOnly = true) +public class ClientChatEventTest +{ @EventHandler public void init(FMLInitializationEvent event) @@ -19,9 +20,13 @@ public class ClientChatEventTest { @SubscribeEvent public void onPlayerAttemptChat(ClientChatEvent event) { - if(event.getMessage().equals("Cancel")) + if (event.getMessage().equals("Cancel")) + { event.setCanceled(true); - else if(event.getMessage().equals("Replace this text")) + } + else if (event.getMessage().equals("Replace this text")) + { event.setMessage("Text replaced."); + } } } diff --git a/src/test/java/net/minecraftforge/test/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/ClientCommandTest.java similarity index 84% rename from src/test/java/net/minecraftforge/test/ClientCommandTest.java rename to src/test/java/net/minecraftforge/debug/ClientCommandTest.java index 08d7101612..dfaa89acf4 100644 --- a/src/test/java/net/minecraftforge/test/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/ClientCommandTest.java @@ -1,8 +1,4 @@ -package net.minecraftforge.test; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +package net.minecraftforge.debug; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; @@ -17,16 +13,21 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.registry.GameData; import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; -@Mod(modid="clientcommandtest", name="Client Command Test", version="0.0.0", clientSideOnly = true) -public class ClientCommandTest { +@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true) +public class ClientCommandTest +{ @EventHandler public void init(FMLInitializationEvent event) { ClientCommandHandler.instance.registerCommand(new TestCommand()); } - private class TestCommand extends CommandBase { + private class TestCommand extends CommandBase + { @Override public String getName() { @@ -57,7 +58,7 @@ public class ClientCommandTest { } @Override - public void execute( MinecraftServer server, ICommandSender sender, String[] args) throws CommandException + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length > 0) { diff --git a/src/test/java/net/minecraftforge/test/CommandTreeBaseTest.java b/src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java similarity index 99% rename from src/test/java/net/minecraftforge/test/CommandTreeBaseTest.java rename to src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java index 3088a5d683..4505ff3325 100644 --- a/src/test/java/net/minecraftforge/test/CommandTreeBaseTest.java +++ b/src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/test/java/net/minecraftforge/debug/ConfigTest.java b/src/test/java/net/minecraftforge/debug/ConfigTest.java index fcd6c5a971..a998f273df 100644 --- a/src/test/java/net/minecraftforge/debug/ConfigTest.java +++ b/src/test/java/net/minecraftforge/debug/ConfigTest.java @@ -1,47 +1,51 @@ package net.minecraftforge.debug; -import java.util.Map; -import java.util.Set; - -import com.google.common.base.Function; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Config; +import net.minecraftforge.common.config.Config.Comment; +import net.minecraftforge.common.config.Config.LangKey; +import net.minecraftforge.common.config.Config.Name; +import net.minecraftforge.common.config.Config.RangeDouble; +import net.minecraftforge.common.config.Config.RangeInt; +import net.minecraftforge.common.config.Config.RequiresMcRestart; +import net.minecraftforge.common.config.Config.Type; import net.minecraftforge.common.config.ConfigManager; -import net.minecraftforge.common.config.Config.*; -import net.minecraftforge.fml.client.IModGuiFactory; -import net.minecraftforge.fml.client.config.GuiConfig; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.logging.log4j.Logger; + +import java.util.Map; @Mod(modid = ConfigTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*") public class ConfigTest { public static final String MODID = "config_test"; + private static Logger logger; @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) { - MinecraftForge.EVENT_BUS.register(this); + public void preInit(FMLPreInitializationEvent event) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); } @Mod.EventHandler - public void init(FMLInitializationEvent event) { - System.out.println("Old: " + CONFIG_TYPES.bool); - CONFIG_TYPES.bool = !CONFIG_TYPES.bool; - System.out.println("New: " + CONFIG_TYPES.bool); - ConfigManager.sync(MODID, Type.INSTANCE); - System.out.println("After sync: " + CONFIG_TYPES.bool); + public void init(FMLInitializationEvent event) + { + logger.debug("Old: " + CONFIG_TYPES.bool); + CONFIG_TYPES.bool = !CONFIG_TYPES.bool; + logger.debug("New: " + CONFIG_TYPES.bool); + ConfigManager.sync(MODID, Type.INSTANCE); + logger.debug("After sync: " + CONFIG_TYPES.bool); } @SubscribeEvent - public void onConfigChangedEvent(OnConfigChangedEvent event) { + public void onConfigChangedEvent(OnConfigChangedEvent event) + { if (event.getModID().equals(MODID)) { ConfigManager.sync(MODID, Type.INSTANCE); @@ -91,6 +95,7 @@ public class ConfigTest public String HeyLook = "I'm Inside!"; } } + @LangKey("config_test.config.annotations") @Config(modid = MODID) public static class CONFIG_ANNOTATIONS @@ -113,6 +118,7 @@ public class ConfigTest public String HeyLook = "Go in!"; } } + @LangKey("config_test.config.subcats") @Config(modid = MODID, name = MODID + "_subcats", category = "") public static class CONFIG_SUBCATS @@ -128,6 +134,7 @@ public class ConfigTest { @Name("i_say") public String value; + public SubCat(String value) { this.value = value; diff --git a/src/test/java/net/minecraftforge/test/CreateFluidSourceTest.java b/src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java similarity index 92% rename from src/test/java/net/minecraftforge/test/CreateFluidSourceTest.java rename to src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java index 66bf165093..4e14961634 100644 --- a/src/test/java/net/minecraftforge/test/CreateFluidSourceTest.java +++ b/src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.init.Blocks; import net.minecraftforge.common.MinecraftForge; @@ -17,7 +17,9 @@ public class CreateFluidSourceTest public static void init(FMLInitializationEvent event) { if (ENABLE) + { MinecraftForge.EVENT_BUS.register(CreateFluidSourceTest.class); + } } @SubscribeEvent @@ -25,8 +27,12 @@ public class CreateFluidSourceTest { // make it work exactly the opposite of how it works by default if (event.getState().getBlock() == Blocks.FLOWING_WATER) + { event.setResult(Result.DENY); + } else + { event.setResult(Result.ALLOW); + } } } diff --git a/src/test/java/net/minecraftforge/test/CustomEntitySelectorTest.java b/src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java similarity index 93% rename from src/test/java/net/minecraftforge/test/CustomEntitySelectorTest.java rename to src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java index 7450cf6b29..0e46e4ef49 100644 --- a/src/test/java/net/minecraftforge/test/CustomEntitySelectorTest.java +++ b/src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import com.google.common.base.Predicate; import net.minecraft.command.ICommandSender; @@ -22,7 +22,6 @@ import java.util.Map; * Spawn a few cows and a few sheep and then use "/kill @e[forge:min_health=!10]" * All entities with less than 10 health points (current, not max) should die. * This should include the sheep, but not the (healthy) cows. - * */ @Mod(modid = "customentityselectortest", name = "Custom Entity Selector Test", version = "1.0", acceptableRemoteVersions = "*") public class CustomEntitySelectorTest @@ -37,7 +36,8 @@ public class CustomEntitySelectorTest private class EntitySelectorFactory implements IEntitySelectorFactory { - @Nonnull @Override + @Nonnull + @Override public List> createPredicates(Map arguments, String mainSelector, ICommandSender sender, Vec3d position) { String health = arguments.get("forge:min_health"); @@ -61,8 +61,11 @@ public class CustomEntitySelectorTest @Override public boolean apply(@Nullable Entity input) { - if (!(input instanceof EntityLivingBase)) return false; - return (((EntityLivingBase) input).getHealth() >= value)!=invert; + if (!(input instanceof EntityLivingBase)) + { + return false; + } + return (((EntityLivingBase) input).getHealth() >= value) != invert; } }); } diff --git a/src/test/java/net/minecraftforge/test/CustomSpawnDimensionTest.java b/src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java similarity index 90% rename from src/test/java/net/minecraftforge/test/CustomSpawnDimensionTest.java rename to src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java index f7011231af..6b55ffcfae 100644 --- a/src/test/java/net/minecraftforge/test/CustomSpawnDimensionTest.java +++ b/src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -8,7 +8,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = CustomSpawnDimensionTest.MODID, name = "CustomSpawnDimensionTest", version = "0.1") +@Mod(modid = CustomSpawnDimensionTest.MODID, name = "CustomSpawnDimensionTest", version = "0.1", acceptableRemoteVersions = "*") public class CustomSpawnDimensionTest { public static final String MODID = "customspawndimensiontest"; @@ -28,7 +28,9 @@ public class CustomSpawnDimensionTest { Entity e = event.getEntity(); if (!(e instanceof EntityPlayer)) + { return; + } BlockPos pos = e.getPosition(); int dim = e.dimension; diff --git a/src/test/java/net/minecraftforge/test/CustomSpriteTest.java b/src/test/java/net/minecraftforge/debug/CustomSpriteTest.java similarity index 92% rename from src/test/java/net/minecraftforge/test/CustomSpriteTest.java rename to src/test/java/net/minecraftforge/debug/CustomSpriteTest.java index 5841691f25..ed19a00ce8 100644 --- a/src/test/java/net/minecraftforge/test/CustomSpriteTest.java +++ b/src/test/java/net/minecraftforge/debug/CustomSpriteTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -11,11 +11,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.FMLLog; 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; import javax.imageio.ImageIO; @@ -30,10 +30,12 @@ public class CustomSpriteTest { static final String MOD_ID = "custom_sprite_test"; static final String NAME = "Custom sprite test"; + private static Logger logger; @Mod.EventHandler - public void init(FMLPreInitializationEvent event) + 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); @@ -82,7 +84,7 @@ public class CustomSpriteTest } catch (IOException ioe) { - FMLLog.getLogger().error("Could not find resource", ioe); + logger.error("Could not find resource", ioe); return true; } this.width = image.getWidth(); diff --git a/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java b/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java index 1f65e9bc5c..dfc3405679 100644 --- a/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java @@ -21,7 +21,9 @@ public class DecorateEventDebug public void init(FMLInitializationEvent event) { if (ENABLED) + { MinecraftForge.TERRAIN_GEN_BUS.register(this); + } } @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/test/DifficultyChangeEventTest.java b/src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java similarity index 50% rename from src/test/java/net/minecraftforge/test/DifficultyChangeEventTest.java rename to src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java index a19430d906..dfa9ec4d42 100644 --- a/src/test/java/net/minecraftforge/test/DifficultyChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java @@ -1,28 +1,32 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; -import net.minecraft.world.EnumDifficulty; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.DifficultyChangeEvent; 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.eventhandler.Event.Result; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.logging.log4j.Logger; -@Mod(modid = "difficultychangeeventtest", name = "DifficultyChangeEventTest", version = "0.0.0") +@Mod(modid = "difficultychangeeventtest", name = "DifficultyChangeEventTest", version = "0.0.0", acceptableRemoteVersions = "*") public class DifficultyChangeEventTest { private static final boolean ENABLE = false; + private static Logger logger; @EventHandler - public void init(FMLInitializationEvent event) + public void preInit(FMLPreInitializationEvent event) { - if (ENABLE) MinecraftForge.EVENT_BUS.register(this); + if (ENABLE) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); + } } @SubscribeEvent public void onDifficultyChange(DifficultyChangeEvent event) { - System.out.println("Difficulty changed from " + event.getOldDifficulty() + " to " + event.getDifficulty()); + logger.info("Difficulty changed from " + event.getOldDifficulty() + " to " + event.getDifficulty()); } } \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/DynBucketTest.java index d2917bf00d..5aff3a7dde 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/DynBucketTest.java @@ -20,14 +20,13 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; - -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ForgeModContainer; @@ -57,6 +56,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -71,6 +71,7 @@ public class DynBucketTest private static final ResourceLocation testItemName = new ResourceLocation(MODID, "testitem"); private static final boolean ENABLE = true; + private static Logger logger; static { @@ -101,7 +102,9 @@ public class DynBucketTest void setupModels() { if (!ENABLE || !ModelFluidDebug.ENABLE) + { return; + } ModelLoader.setBucketModelDefinition(dynBucket); @@ -125,8 +128,11 @@ public class DynBucketTest 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); @@ -173,13 +179,16 @@ public class DynBucketTest } } - public static class TestItem extends Item { + public static class TestItem extends Item + { @Override public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) { ItemStack itemStackIn = playerIn.getHeldItem(hand); - if(worldIn.isRemote) + if (worldIn.isRemote) + { return new ActionResult(EnumActionResult.PASS, itemStackIn); + } ItemStackHandler handler = new ItemStackHandler(5); ItemStackHandler handler2 = new ItemStackHandler(5); @@ -197,16 +206,19 @@ public class DynBucketTest handler2.setStackInSlot(3, new ItemStack(Blocks.LOG)); handler2.setStackInSlot(4, new ItemStack(Blocks.DIAMOND_BLOCK)); - for (int i = 0; i < handler.getSlots(); i++) { - System.out.println("Expected 1: " + handler.getStackInSlot(i)); + for (int i = 0; i < handler.getSlots(); i++) + { + logger.info("Expected 1: " + handler.getStackInSlot(i)); } - for (int i = 0; i < handler2.getSlots(); i++) { - System.out.println("Expected 2: " + handler2.getStackInSlot(i)); + for (int i = 0; i < handler2.getSlots(); i++) + { + logger.info("Expected 2: " + handler2.getStackInSlot(i)); } - for (int i = 0; i < joined.getSlots(); i++) { - System.out.println("Joined: " + joined.getStackInSlot(i)); + for (int i = 0; i < joined.getSlots(); i++) + { + logger.info("Joined: " + joined.getStackInSlot(i)); } return new ActionResult(EnumActionResult.SUCCESS, itemStackIn); @@ -230,7 +242,9 @@ public class DynBucketTest { ItemStack bucket = new ItemStack(this, 1, i); if (FluidUtil.getFluidContained(bucket) != null) + { subItems.add(bucket); + } } } } @@ -269,7 +283,8 @@ public class DynBucketTest { ItemStack heldItem = playerIn.getHeldItem(hand); IFluidHandler tank = FluidUtil.getFluidHandler(worldIn, pos, side.getOpposite()); - if (tank == null) { + if (tank == null) + { return false; } @@ -302,7 +317,8 @@ public class DynBucketTest if (tankProperties.length > 0 && tankProperties[0] != null && tankProperties[0].getContents() != null) { text = tankProperties[0].getContents().amount + "x " + tankProperties[0].getContents().getLocalizedName(); - } else + } + else { text = "empty"; } @@ -331,14 +347,16 @@ public class DynBucketTest } @Override - public SPacketUpdateTileEntity getUpdatePacket() { + public SPacketUpdateTileEntity getUpdatePacket() + { NBTTagCompound tag = new NBTTagCompound(); tag = writeToNBT(tag); return new SPacketUpdateTileEntity(this.getPos(), this.getBlockMetadata(), tag); } @Override - public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) { + public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity pkt) + { super.onDataPacket(net, pkt); readFromNBT(pkt.getNbtCompound()); } diff --git a/src/test/java/net/minecraftforge/test/EnchantmentLevelSetTest.java b/src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java similarity index 59% rename from src/test/java/net/minecraftforge/test/EnchantmentLevelSetTest.java rename to src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java index d70a2d8dd8..1d25344006 100644 --- a/src/test/java/net/minecraftforge/test/EnchantmentLevelSetTest.java +++ b/src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java @@ -1,22 +1,25 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.enchanting.EnchantmentLevelSetEvent; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.logging.log4j.Logger; -@Mod(modid = "enchantmentlevelsettest", name = "EnchantmentLevelSetTest", version = "1.0") +@Mod(modid = "enchantmentlevelsettest", name = "EnchantmentLevelSetTest", version = "1.0", acceptableRemoteVersions = "*") public class EnchantmentLevelSetTest { public static final boolean ENABLE = false; + private static Logger logger; @Mod.EventHandler - public static void init(FMLInitializationEvent event) + public static void preInit(FMLPreInitializationEvent event) { - if (ENABLE) { - FMLLog.info("Wiring up enchantment level set test"); + if (ENABLE) + { + logger = event.getModLog(); + logger.info("Wiring up enchantment level set test"); MinecraftForge.EVENT_BUS.register(EnchantmentLevelSetTest.class); } } @@ -25,7 +28,7 @@ public class EnchantmentLevelSetTest public static void onEnchantmentLevelSet(EnchantmentLevelSetEvent event) { // invert enchantment level, just for fun - FMLLog.info("Enchantment row: " + event.getEnchantRow() + ", level: " + event.getLevel()); + logger.info("Enchantment row: " + event.getEnchantRow() + ", level: " + event.getLevel()); event.setLevel(30 - event.getLevel()); } } diff --git a/src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java b/src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java new file mode 100644 index 0000000000..3b614d1985 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java @@ -0,0 +1,36 @@ +package net.minecraftforge.debug; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityTravelToDimensionEvent; +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 org.apache.logging.log4j.Logger; + +@Mod(modid = "entitytraveltodimensioneventtest", name = "EntityTravelToDimensionEventTest", version = "0.0.0", acceptableRemoteVersions = "*") +public class EntityTravelToDimensionEventTest +{ + public static final boolean ENABLE = false; + private static Logger logger; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLE) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void onDimensionTravel(EntityTravelToDimensionEvent event) + { + if (ENABLE) + { + logger.info("Travelling to Dimension " + event.getDimension() + " Entity: " + event.getEntity()); + event.setCanceled(true); + } + } +} diff --git a/src/test/java/net/minecraftforge/test/EntityUpdateBlockedTest.java b/src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java similarity index 89% rename from src/test/java/net/minecraftforge/test/EntityUpdateBlockedTest.java rename to src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java index 0a8bb28ffa..09b2dab624 100644 --- a/src/test/java/net/minecraftforge/test/EntityUpdateBlockedTest.java +++ b/src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; @@ -9,7 +9,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -@Mod(modid = "entityupdateblockedtest", name = "Entity Update Blocked Test", version = "1.0.0") +@Mod(modid = "entityupdateblockedtest", name = "Entity Update Blocked Test", version = "1.0.0", acceptableRemoteVersions = "*") public class EntityUpdateBlockedTest { @Mod.EventHandler @@ -37,12 +37,16 @@ public class EntityUpdateBlockedTest public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length != 1) + { return; + } boolean value = Boolean.parseBoolean(args[0]); for (Entity ent : sender.getEntityWorld().loadedEntityList) { if (!(ent instanceof EntityPlayer)) + { ent.updateBlocked = value; + } } } } diff --git a/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java b/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java index 0e09b4abc3..552b3a0c82 100644 --- a/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java @@ -4,13 +4,19 @@ import net.minecraftforge.common.BiomeManager.BiomeType; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; @Mod(modid = "enumplanttypetest", name = "EnumPlantTypeTest", version = "1.0", acceptableRemoteVersions = "*") public class EnumPlantTypeTest { - private static Logger LOGGER = LogManager.getLogger(); + private static Logger logger; + + @Mod.EventHandler + public void onPreInit(FMLPreInitializationEvent event) + { + logger = event.getModLog(); + } @Mod.EventHandler public void onInit(FMLInitializationEvent event) @@ -22,28 +28,30 @@ public class EnumPlantTypeTest } catch (NullPointerException npe) { - LOGGER.warn("EnumHelper in BiomeType is working incorrectly!", npe); + logger.warn("EnumHelper in BiomeType is working incorrectly!", npe); } finally { if (biomeType == null || !biomeType.name().equals("FAKE")) - LOGGER.warn("EnumHelper in BiomeType is working incorrectly!"); + { + logger.warn("EnumHelper in BiomeType is working incorrectly!"); + } } EnumPlantType plantType = null; - if (plantType == null || !plantType.name().equals("FAKE")) - ; try { plantType = EnumPlantType.getPlantType("FAKE"); } catch (NullPointerException npe) { - LOGGER.warn("EnumHelper in EnumPlantType is working incorrectly!", npe); + logger.warn("EnumHelper in EnumPlantType is working incorrectly!", npe); } finally { if (plantType == null || !plantType.name().equals("FAKE")) - LOGGER.warn("EnumHelper in EnumPlantType is working incorrectly!"); + { + logger.warn("EnumHelper in EnumPlantType is working incorrectly!"); + } } } } diff --git a/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java b/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java index 6588e55ed1..b1f504f5f0 100644 --- a/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java +++ b/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java @@ -21,20 +21,25 @@ package net.minecraftforge.debug; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.logging.log4j.Logger; -@Mod(modid = "equipment_change_test", version = "1.0.0") -public class EquipmentChangeTest +@Mod(modid = "equipment_change_test", name = "Equipment Change Test", version = "1.0.0", acceptableRemoteVersions = "*") +public class EquipmentChangeTest { + private static final boolean ENABLED = false; + private static Logger logger; @Mod.EventHandler - public void onInit(FMLInitializationEvent event) + public void preInit(FMLPreInitializationEvent event) { - //register the eventhandler - MinecraftForge.EVENT_BUS.register(this); + if (ENABLED) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); + } } /** @@ -42,10 +47,10 @@ public class EquipmentChangeTest * Serverside only! */ @SubscribeEvent - public void onEquipmentChange(LivingEquipmentChangeEvent event) + public void onEquipmentChange(LivingEquipmentChangeEvent event) { //a debug console print - FMLLog.info("[Equipment-Change] " + event.getEntity() + " changed his Equipment in " + logger.info("[Equipment-Change] " + event.getEntity() + " changed his Equipment in " + event.getSlot() + " from " + event.getFrom() + " to " + event.getTo()); } diff --git a/src/test/java/net/minecraftforge/test/FOVModifierTest.java b/src/test/java/net/minecraftforge/debug/FOVModifierTest.java similarity index 68% rename from src/test/java/net/minecraftforge/test/FOVModifierTest.java rename to src/test/java/net/minecraftforge/debug/FOVModifierTest.java index 495bf99244..e9a51ecaa1 100644 --- a/src/test/java/net/minecraftforge/test/FOVModifierTest.java +++ b/src/test/java/net/minecraftforge/debug/FOVModifierTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.block.material.Material; import net.minecraftforge.client.event.EntityViewRenderEvent; @@ -8,9 +8,12 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -/** Simple mod to test fov modifier. */ -@Mod(modid="fovmodifiertest", name="FOV Modifier Test", version="0.0.0", clientSideOnly = true) -public class FOVModifierTest { +/** + * Simple mod to test fov modifier. + */ +@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true) +public class FOVModifierTest +{ @EventHandler public void init(FMLInitializationEvent event) @@ -19,8 +22,11 @@ public class FOVModifierTest { } @SubscribeEvent - public void getFOVModifier(EntityViewRenderEvent.FOVModifier event) { - if(event.getState().getMaterial() == Material.WATER) + public void getFOVModifier(EntityViewRenderEvent.FOVModifier event) + { + if (event.getState().getMaterial() == Material.WATER) + { event.setFOV(event.getFOV() / 60.0f * 50.0f); + } } } diff --git a/src/test/java/net/minecraftforge/test/FluidHandlerTest.java b/src/test/java/net/minecraftforge/debug/FluidHandlerTest.java similarity index 86% rename from src/test/java/net/minecraftforge/test/FluidHandlerTest.java rename to src/test/java/net/minecraftforge/debug/FluidHandlerTest.java index 187d432001..bfb998bd44 100644 --- a/src/test/java/net/minecraftforge/test/FluidHandlerTest.java +++ b/src/test/java/net/minecraftforge/debug/FluidHandlerTest.java @@ -1,6 +1,4 @@ -package net.minecraftforge.test; - -import java.util.List; +package net.minecraftforge.debug; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -11,26 +9,38 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; +import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.List; -@Mod(modid="fluidhandlertest", name="FluidHandlerTest", version="0.0.0", acceptableRemoteVersions = "*") +@Mod(modid = "fluidhandlertest", name = "FluidHandlerTest", version = "0.0.0", clientSideOnly = true) public class FluidHandlerTest { - public static final boolean ENABLE = true; + public static final boolean ENABLE = false; + private static Logger logger; + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLE) + { + logger = event.getModLog(); + } + } @Mod.EventHandler public void loadComplete(FMLLoadCompleteEvent event) { - if (!ENABLE || FMLCommonHandler.instance().getSide() != Side.CLIENT) + if (!ENABLE) + { return; + } for (ItemStack stack : getAllItems()) { @@ -48,7 +58,7 @@ public class FluidHandlerTest { FluidStack drain = fluidHandler.drain(Integer.MAX_VALUE, true); ItemStack drainedStack = fluidHandler.getContainer(); - FMLLog.info("Draining " + stackString(stack) + " gives " + fluidString(drain) + " and " + stackString(drainedStack)); + logger.info("Draining " + stackString(stack) + " gives " + fluidString(drain) + " and " + stackString(drainedStack)); if (drain == null && !ItemStack.areItemStacksEqual(originalStack, preDrainStack)) { @@ -66,7 +76,7 @@ public class FluidHandlerTest if (filled > 0) { - FMLLog.info("Filling " + stackString(stack) + " with " + fluidString(new FluidStack(fluid, filled)) + " gives " + stackString(filledStack)); + logger.info("Filling " + stackString(stack) + " with " + fluidString(new FluidStack(fluid, filled)) + " gives " + stackString(filledStack)); } else { diff --git a/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java b/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java index a1f3f0e2d1..cc5866264b 100644 --- a/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java +++ b/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java @@ -9,14 +9,22 @@ import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBucket; +import net.minecraft.item.ItemBucketMilk; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper; import net.minecraftforge.fml.common.Mod; @@ -33,7 +41,7 @@ import java.util.List; import static net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack.FLUID_NBT_KEY; -@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION) +@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION, acceptableRemoteVersions = "*") public class FluidPlacementTest { public static final String MODID = "forgedebugfluidplacement"; @@ -168,7 +176,7 @@ public class FluidPlacementTest public int fill(FluidStack resource, boolean doFill) { if (container.getCount() != 1 || resource == null || resource.amount > Fluid.BUCKET_VOLUME || container - .getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource)) + .getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource)) { return 0; } @@ -219,7 +227,9 @@ public class FluidPlacementTest { container = container.copy(); if (container.getTagCompound() != null) + { container.setTagCompound(container.getTagCompound().getCompoundTag(FLUID_NBT_KEY)); + } return super.getFluid(container); } diff --git a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java b/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java index 3ecbdb7d0e..49297cb4d2 100644 --- a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java +++ b/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java @@ -1,14 +1,12 @@ package net.minecraftforge.debug; -import java.util.Map; -import java.util.Map.Entry; - +import com.google.common.collect.Maps; import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.renderer.block.statemap.StateMap; -import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemMultiTexture; @@ -23,22 +21,25 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import com.google.common.base.Function; -import com.google.common.collect.Maps; +import java.util.Map; +import java.util.Map.Entry; @Mod(modid = ForgeBlockStatesLoaderDebug.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber -public class ForgeBlockStatesLoaderDebug { +public class ForgeBlockStatesLoaderDebug +{ public static final String MODID = "forgeblockstatesloader"; public static final String ASSETS = "forgeblockstatesloader:"; @ObjectHolder(MODID) - public static class BLOCKS { + public static class BLOCKS + { public static final BlockWall custom_wall = null; } @ObjectHolder(MODID) - public static class ITEMS { + public static class ITEMS + { public static final ItemMultiTexture custom_wall = null; } @@ -46,7 +47,7 @@ public class ForgeBlockStatesLoaderDebug { public static void registerBlocks(RegistryEvent.Register event) { event.getRegistry().registerAll( - new BlockWall(Blocks.COBBLESTONE).setUnlocalizedName(MODID + ".customWall").setRegistryName(MODID, "custom_wall") + new BlockWall(Blocks.COBBLESTONE).setUnlocalizedName(MODID + ".customWall").setRegistryName(MODID, "custom_wall") ); } @@ -54,14 +55,14 @@ public class ForgeBlockStatesLoaderDebug { public static void registerItems(RegistryEvent.Register event) { event.getRegistry().registerAll( - new ItemMultiTexture(BLOCKS.custom_wall, BLOCKS.custom_wall, new ItemMultiTexture.Mapper() - { - @Override - public String apply(ItemStack stack) + new ItemMultiTexture(BLOCKS.custom_wall, BLOCKS.custom_wall, new ItemMultiTexture.Mapper() { - return BlockWall.EnumType.byMetadata(stack.getMetadata()).getUnlocalizedName(); - } - }).setRegistryName(BLOCKS.custom_wall.getRegistryName()) + @Override + public String apply(ItemStack stack) + { + return BlockWall.EnumType.byMetadata(stack.getMetadata()).getUnlocalizedName(); + } + }).setRegistryName(BLOCKS.custom_wall.getRegistryName()) ); } @@ -74,7 +75,9 @@ public class ForgeBlockStatesLoaderDebug { //GameRegistry.registerBlock(blockCustom); if (event.getSide() == Side.CLIENT) + { preInitClient(event); + } } @SideOnly(Side.CLIENT) @@ -85,10 +88,11 @@ public class ForgeBlockStatesLoaderDebug { ModelLoader.setCustomStateMapper(BLOCKS.custom_wall, new IStateMapper() { StateMap stateMap = new StateMap.Builder().withName(BlockWall.VARIANT).withSuffix("_wall").build(); + @Override public Map putStateModelLocations(Block block) { - Map map = (Map) stateMap.putStateModelLocations(block); + Map map = stateMap.putStateModelLocations(block); Map newMap = Maps.newHashMap(); for (Entry e : map.entrySet()) diff --git a/src/test/java/net/minecraftforge/test/IsBookEnchantableTest.java b/src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java similarity index 86% rename from src/test/java/net/minecraftforge/test/IsBookEnchantableTest.java rename to src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java index 4570267f5f..0a57f7ccb5 100644 --- a/src/test/java/net/minecraftforge/test/IsBookEnchantableTest.java +++ b/src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; @@ -8,10 +8,11 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0") +@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber public class IsBookEnchantableTest { + public static final boolean ENABLED = false; static final String MOD_ID = "is_book_enchantable_test"; private static final Item TEST_ITEM = new TestItem(); @@ -19,7 +20,10 @@ public class IsBookEnchantableTest @SubscribeEvent public static void registerItem(RegistryEvent.Register event) { - event.getRegistry().register(TEST_ITEM); + if (ENABLED) + { + event.getRegistry().register(TEST_ITEM); + } } private static class TestItem extends Item diff --git a/src/test/java/net/minecraftforge/test/ItemCanDestroyBlocksInCreativeTest.java b/src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java similarity index 95% rename from src/test/java/net/minecraftforge/test/ItemCanDestroyBlocksInCreativeTest.java rename to src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java index 31ea992a44..b51bc4ff14 100644 --- a/src/test/java/net/minecraftforge/test/ItemCanDestroyBlocksInCreativeTest.java +++ b/src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -31,6 +31,8 @@ public class ItemCanDestroyBlocksInCreativeTest public static void init(FMLInitializationEvent event) { if (ENABLE) + { GameRegistry.register(testItem); + } } } \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/test/ItemFishedTest.java b/src/test/java/net/minecraftforge/debug/ItemFishedTest.java similarity index 95% rename from src/test/java/net/minecraftforge/test/ItemFishedTest.java rename to src/test/java/net/minecraftforge/debug/ItemFishedTest.java index 8b10f7c9b1..843233f7af 100644 --- a/src/test/java/net/minecraftforge/test/ItemFishedTest.java +++ b/src/test/java/net/minecraftforge/debug/ItemFishedTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraft.init.Biomes; @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = "itemfishtest", name = "ItemFishTest", version = "1.0.0") +@Mod(modid = "itemfishtest", name = "ItemFishTest", version = "1.0.0", acceptableRemoteVersions = "*") public class ItemFishedTest { diff --git a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java index b6fe45c8f3..434b080273 100644 --- a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java @@ -18,10 +18,8 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import java.util.Random; - -import javax.annotation.Nonnull; import javax.annotation.Nullable; +import java.util.Random; @Mod(modid = ItemLayerModelDebug.MODID, name = "ForgeDebugItemLayerModel", version = ItemLayerModelDebug.VERSION, acceptableRemoteVersions = "*") public class ItemLayerModelDebug @@ -33,7 +31,10 @@ public class ItemLayerModelDebug public static CommonProxy proxy; @EventHandler - public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + public void preInit(FMLPreInitializationEvent event) + { + proxy.preInit(event); + } public static class CommonProxy { @@ -43,11 +44,14 @@ public class ItemLayerModelDebug } } - public static class ServerProxy extends CommonProxy {} + 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) { @@ -94,16 +98,19 @@ public class ItemLayerModelDebug } @Override - public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState) { + public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState) + { // This tool is a super pickaxe if the player is wearing a helment - if("pickaxe".equals(toolClass) && player != null && !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty()) { + if ("pickaxe".equals(toolClass) && player != null && !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty()) + { return 5; } return super.getHarvestLevel(stack, toolClass, player, blockState); } @Override - public float getStrVsBlock(ItemStack stack, IBlockState state) { + public float getStrVsBlock(ItemStack stack, IBlockState state) + { return 10f; } } diff --git a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java index 99ab0d303f..66c744af27 100644 --- a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java +++ b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java @@ -4,8 +4,8 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -24,6 +24,7 @@ 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.GameRegistry; + import static org.lwjgl.opengl.GL11.*; @Mod(modid = ItemTileDebug.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*") @@ -37,10 +38,16 @@ public class ItemTileDebug public static CommonProxy proxy; @EventHandler - public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + public void preInit(FMLPreInitializationEvent event) + { + proxy.preInit(event); + } @EventHandler - public void init(FMLInitializationEvent event) { proxy.init(event); } + public void init(FMLInitializationEvent event) + { + proxy.init(event); + } public static class CommonProxy { @@ -51,10 +58,14 @@ public class ItemTileDebug 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 { @@ -72,7 +83,8 @@ public class ItemTileDebug } @Override - public void init(FMLInitializationEvent event) { + public void init(FMLInitializationEvent event) + { ClientRegistry.bindTileEntitySpecialRenderer(CustomTileEntity.class, TestTESR.instance); } } @@ -81,7 +93,9 @@ public class ItemTileDebug { public static final BakeEventHandler instance = new BakeEventHandler(); - private BakeEventHandler() {}; + private BakeEventHandler() + { + } @SubscribeEvent public void onModelBakeEvent(ModelBakeEvent event) @@ -94,7 +108,9 @@ public class ItemTileDebug { private static final TestTESR instance = new TestTESR(); - private TestTESR() {} + private TestTESR() + { + } @Override public void renderTileEntityAt(CustomTileEntity p_180535_1_, double x, double y, double z, float p_180535_8_, int p_180535_9_) @@ -130,13 +146,22 @@ public class ItemTileDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } @Override public TileEntity createNewTileEntity(World world, int meta) @@ -145,5 +170,7 @@ public class ItemTileDebug } } - public static class CustomTileEntity extends TileEntity {} + public static class CustomTileEntity extends TileEntity + { + } } diff --git a/src/test/java/net/minecraftforge/test/LootTableLoadEventTest.java b/src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java similarity index 76% rename from src/test/java/net/minecraftforge/test/LootTableLoadEventTest.java rename to src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java index aa544aea7d..74b19a0763 100644 --- a/src/test/java/net/minecraftforge/test/LootTableLoadEventTest.java +++ b/src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootTable; @@ -11,20 +11,26 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = LootTableLoadEventTest.MODID, name = "LootTableLoadEventTest", version = "1.0", acceptableRemoteVersions = "*") -public class LootTableLoadEventTest { +public class LootTableLoadEventTest +{ + public static final boolean ENABLED = false; public static final String MODID = "loottable_load_event_test"; @EventHandler public void init(FMLInitializationEvent event) { - MinecraftForge.EVENT_BUS.register(this); + if (ENABLED) + { + MinecraftForge.EVENT_BUS.register(this); + } } @SubscribeEvent public void onLootTableLoadEvent(LootTableLoadEvent event) { - if (LootTableList.CHESTS_SPAWN_BONUS_CHEST.equals(event.getName())) { - ResourceLocation loc = new ResourceLocation(MODID,"chests/custom_spawn_bonus_chest"); + if (LootTableList.CHESTS_SPAWN_BONUS_CHEST.equals(event.getName())) + { + ResourceLocation loc = new ResourceLocation(MODID, "chests/custom_spawn_bonus_chest"); LootTable customLootTable = event.getLootTableManager().getLootTableFromLocation(loc); event.setTable(customLootTable); } diff --git a/src/test/java/net/minecraftforge/debug/LootTablesDebug.java b/src/test/java/net/minecraftforge/debug/LootTablesDebug.java index d1a893c618..b14501a5d9 100644 --- a/src/test/java/net/minecraftforge/debug/LootTablesDebug.java +++ b/src/test/java/net/minecraftforge/debug/LootTablesDebug.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; import net.minecraft.util.DamageSource; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootEntryItem; import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.LootTableList; @@ -18,21 +17,23 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = LootTablesDebug.MODID, name = "Loot Table Debug", version = "1.0", acceptableRemoteVersions = "*") -public class LootTablesDebug { +public class LootTablesDebug +{ public static final String MODID = "loot_table_debug"; - private static final ResourceLocation CUSTOM_LOOT = LootTableList.register(new ResourceLocation(MODID, "custom_loot")); @Mod.EventHandler public void init(FMLInitializationEvent event) { - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent public void lootLoad(LootTableLoadEvent event) { if (!event.getName().equals(LootTableList.CHESTS_SPAWN_BONUS_CHEST)) + { return; + } // Remove axes and replace with chestpeice, First vanilla entry is always called "main" LootPool main = event.getTable().getPool("main"); //Note: This CAN NPE if another mod removes things @@ -45,10 +46,12 @@ public class LootTablesDebug { } @SubscribeEvent - public void lootingEvent(LootingLevelEvent event) { + public void lootingEvent(LootingLevelEvent event) + { // if the player shoots something with a projectile, use looting 3 DamageSource damageSource = event.getDamageSource(); - if(damageSource.isProjectile() && damageSource.getEntity() instanceof EntityPlayer && damageSource.getSourceOfDamage() instanceof EntityArrow) { + if (damageSource.isProjectile() && damageSource.getEntity() instanceof EntityPlayer && damageSource.getSourceOfDamage() instanceof EntityArrow) + { event.setLootingLevel(3); } } diff --git a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java index 8b376c402f..53ffd072cd 100644 --- a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java @@ -1,7 +1,7 @@ package net.minecraftforge.debug; +import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; -import net.minecraft.block.BlockPistonBase; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyDirection; @@ -54,8 +54,7 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; - -import com.google.common.collect.ImmutableMap; +import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -75,6 +74,7 @@ public class ModelAnimationDebug @SidedProxy public static CommonProxy proxy; + private static Logger logger; public static abstract class CommonProxy { @@ -91,14 +91,20 @@ public class ModelAnimationDebug @Override public ExtendedBlockState createBlockState() { - return new ExtendedBlockState(this, new IProperty[]{ FACING, Properties.StaticProperty }, new IUnlistedProperty[]{ Properties.AnimationProperty }); + return new ExtendedBlockState(this, new IProperty[]{FACING, Properties.StaticProperty}, new IUnlistedProperty[]{Properties.AnimationProperty}); } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) @@ -107,27 +113,32 @@ public class ModelAnimationDebug } @Override - public IBlockState getStateFromMeta(int meta) { + public IBlockState getStateFromMeta(int meta) + { return getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); } @Override - public int getMetaFromState(IBlockState state) { - return ((EnumFacing)state.getValue(FACING)).getIndex(); + public int getMetaFromState(IBlockState state) + { + return state.getValue(FACING).getIndex(); } @Override - public boolean hasTileEntity(IBlockState state) { + public boolean hasTileEntity(IBlockState state) + { return true; } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(World world, IBlockState state) + { return new Chest(); } @Override - public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { + public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) + { return state.withProperty(Properties.StaticProperty, true); } @@ -144,12 +155,12 @@ public class ModelAnimationDebug @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if(world.isRemote) + if (world.isRemote) { TileEntity te = world.getTileEntity(pos); - if(te instanceof Chest) + if (te instanceof Chest) { - ((Chest)te).click(player.isSneaking()); + ((Chest) te).click(player.isSneaking()); } } return true; @@ -214,13 +225,13 @@ public class ModelAnimationDebug }*/ ResourceLocation location = new ModelResourceLocation(new ResourceLocation(MODID, blockName), "entity"); return new RenderLiving(manager, new net.minecraftforge.client.model.animation.AnimationModelBase(location, new VertexLighterSmoothAo(Minecraft.getMinecraft().getBlockColors())) + { + @Override + public void handleEvents(EntityChest chest, float time, Iterable pastEvents) { - @Override - public void handleEvents(EntityChest chest, float time, Iterable pastEvents) - { - chest.handleEvents(time, pastEvents); - } - }, 0.5f) + chest.handleEvents(time, pastEvents); + } + }, 0.5f) { protected ResourceLocation getEntityTexture(EntityChest entity) { @@ -243,7 +254,7 @@ public class ModelAnimationDebug private final VariableValue cycleLength = new VariableValue(4); private final IAnimationStateMachine asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/engine.json"), ImmutableMap.of( - "cycle_length", cycleLength + "cycle_length", cycleLength )); @Override @@ -256,7 +267,7 @@ public class ModelAnimationDebug @Nullable public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { - if(capability == CapabilityAnimation.ANIMATION_CAPABILITY) + if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } @@ -265,7 +276,11 @@ public class ModelAnimationDebug } @EventHandler - public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + public void preInit(FMLPreInitializationEvent event) + { + logger = event.getModLog(); + proxy.preInit(event); + } public static class Chest extends TileEntity { @@ -275,22 +290,23 @@ public class ModelAnimationDebug private final VariableValue clickTime = new VariableValue(Float.NEGATIVE_INFINITY); //private final VariableValue offset = new VariableValue(0); - public Chest() { + public Chest() + { /*asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/chest.json"), ImmutableMap.of( "click_time", clickTime ));*/ asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/engine.json"), ImmutableMap.of( - "cycle_length", cycleLength, - "click_time", clickTime - //"offset", offset + "cycle_length", cycleLength, + "click_time", clickTime + //"offset", offset )); } public void handleEvents(float time, Iterable pastEvents) { - for(Event event : pastEvents) + for (Event event : pastEvents) { - System.out.println("Event: " + event.event() + " " + event.offset() + " " + getPos() + " " + time); + logger.info("Event: " + event.event() + " " + event.offset() + " " + getPos() + " " + time); } } @@ -306,9 +322,9 @@ public class ModelAnimationDebug public void click(boolean sneaking) { - if(asm != null) + if (asm != null) { - if(sneaking) + if (sneaking) { cycleLength.setValue(6 - cycleLength.apply(0)); } @@ -322,7 +338,7 @@ public class ModelAnimationDebug clickTime.setValue(Animation.getWorldTime(getWorld())); asm.transition("closing"); }*/ - else if(asm.currentState().equals("default")) + else if (asm.currentState().equals("default")) { float time = Animation.getWorldTime(getWorld(), Animation.getPartialTickTime()); clickTime.setValue(time); @@ -330,7 +346,7 @@ public class ModelAnimationDebug //asm.transition("moving"); asm.transition("starting"); } - else if(asm.currentState().equals("moving")) + else if (asm.currentState().equals("moving")) { clickTime.setValue(Animation.getWorldTime(getWorld(), Animation.getPartialTickTime())); asm.transition("stopping"); @@ -341,7 +357,7 @@ public class ModelAnimationDebug @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { - if(capability == CapabilityAnimation.ANIMATION_CAPABILITY) + if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return true; } @@ -352,7 +368,7 @@ public class ModelAnimationDebug @Nullable public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { - if(capability == CapabilityAnimation.ANIMATION_CAPABILITY) + if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } @@ -370,7 +386,7 @@ public class ModelAnimationDebug super(world); setSize(1, 1); asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/engine.json"), ImmutableMap.of( - "cycle_length", cycleLength + "cycle_length", cycleLength )); } @@ -399,7 +415,7 @@ public class ModelAnimationDebug @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { - if(capability == CapabilityAnimation.ANIMATION_CAPABILITY) + if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return true; } @@ -410,7 +426,7 @@ public class ModelAnimationDebug @Nullable public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { - if(capability == CapabilityAnimation.ANIMATION_CAPABILITY) + if (capability == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } diff --git a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java index b4844028af..4bf5cae032 100644 --- a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java @@ -1,8 +1,7 @@ package net.minecraftforge.debug; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.collect.ImmutableList; +import com.google.common.primitives.Ints; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -45,10 +44,9 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import com.google.common.collect.ImmutableList; -import com.google.common.primitives.Ints; - import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; @Mod(modid = ModelBakeEventDebug.MODID, name = "ForgeDebugModelBakeEvent", version = ModelBakeEventDebug.VERSION, acceptableRemoteVersions = "*") public class ModelBakeEventDebug @@ -64,7 +62,7 @@ public class ModelBakeEventDebug static { - for(EnumFacing f : EnumFacing.values()) + for (EnumFacing f : EnumFacing.values()) { properties[f.ordinal()] = Properties.toUnlisted(PropertyInteger.create(f.getName(), 0, (1 << (cubeSize * cubeSize)) - 1)); } @@ -74,7 +72,10 @@ public class ModelBakeEventDebug public static CommonProxy proxy; @EventHandler - public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + public void preInit(FMLPreInitializationEvent event) + { + proxy.preInit(event); + } public static class CommonProxy { @@ -86,7 +87,9 @@ public class ModelBakeEventDebug } } - public static class ServerProxy extends CommonProxy {} + public static class ServerProxy extends CommonProxy + { + } public static class ClientProxy extends CommonProxy { @@ -99,7 +102,8 @@ public class ModelBakeEventDebug super.preInit(event); Item item = Item.getItemFromBlock(CustomModelBlock.instance); ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation); - ModelLoader.setCustomStateMapper(CustomModelBlock.instance, new StateMapperBase(){ + ModelLoader.setCustomStateMapper(CustomModelBlock.instance, new StateMapperBase() + { protected ModelResourceLocation getModelResourceLocation(IBlockState p_178132_1_) { return blockLocation; @@ -113,7 +117,9 @@ public class ModelBakeEventDebug { public static final BakeEventHandler instance = new BakeEventHandler(); - private BakeEventHandler() {}; + private BakeEventHandler() + { + } @SubscribeEvent public void onModelBakeEvent(ModelBakeEvent event) @@ -140,16 +146,28 @@ public class ModelBakeEventDebug } @Override - public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } + public EnumBlockRenderType getRenderType(IBlockState state) + { + return EnumBlockRenderType.MODEL; + } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } @Override public TileEntity createNewTileEntity(World world, int meta) @@ -161,14 +179,17 @@ public class ModelBakeEventDebug public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity te = world.getTileEntity(pos); - if(te instanceof CustomTileEntity) + if (te instanceof CustomTileEntity) { CustomTileEntity cte = (CustomTileEntity) te; Vec3d vec = revRotate(new Vec3d(hitX - .5, hitY - .5, hitZ - .5), side).addVector(.5, .5, .5); IUnlistedProperty property = properties[side.ordinal()]; Integer value = cte.getState().getValue(property); - if(value == null) value = 0; - value ^= (1 << ( cubeSize * ((int)(vec.xCoord * (cubeSize - .0001))) + ((int)(vec.zCoord * (cubeSize - .0001))) )); + if (value == null) + { + value = 0; + } + value ^= (1 << (cubeSize * ((int) (vec.xCoord * (cubeSize - .0001))) + ((int) (vec.zCoord * (cubeSize - .0001))))); cte.setState(cte.getState().withProperty(property, value)); world.markBlockRangeForRenderUpdate(pos, pos); } @@ -179,7 +200,7 @@ public class ModelBakeEventDebug public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity te = world.getTileEntity(pos); - if(te instanceof CustomTileEntity) + if (te instanceof CustomTileEntity) { CustomTileEntity cte = (CustomTileEntity) te; return cte.getState(); @@ -197,13 +218,16 @@ public class ModelBakeEventDebug public static class CustomTileEntity extends TileEntity { private IExtendedBlockState state; - public CustomTileEntity() {} + + public CustomTileEntity() + { + } public IExtendedBlockState getState() { - if(state == null) + if (state == null) { - state = (IExtendedBlockState)getBlockType().getDefaultState(); + state = (IExtendedBlockState) getBlockType().getDefaultState(); } return state; } @@ -228,14 +252,14 @@ public class ModelBakeEventDebug // TODO update to builder private int[] vertexToInts(float x, float y, float z, int color, TextureAtlasSprite texture, float u, float v) { - return new int[] { - Float.floatToRawIntBits(x), - Float.floatToRawIntBits(y), - Float.floatToRawIntBits(z), - color, - Float.floatToRawIntBits(texture.getInterpolatedU(u)), - Float.floatToRawIntBits(texture.getInterpolatedV(v)), - 0 + return new int[]{ + Float.floatToRawIntBits(x), + Float.floatToRawIntBits(y), + Float.floatToRawIntBits(z), + color, + Float.floatToRawIntBits(texture.getInterpolatedU(u)), + Float.floatToRawIntBits(texture.getInterpolatedV(v)), + 0 }; } @@ -246,33 +270,36 @@ public class ModelBakeEventDebug Vec3d v3 = rotate(new Vec3d(x2 - .5, y - .5, z2 - .5), side).addVector(.5, .5, .5); Vec3d v4 = rotate(new Vec3d(x2 - .5, y - .5, z1 - .5), side).addVector(.5, .5, .5); return new BakedQuad(Ints.concat( - vertexToInts((float)v1.xCoord, (float)v1.yCoord, (float)v1.zCoord, -1, texture, 0, 0), - vertexToInts((float)v2.xCoord, (float)v2.yCoord, (float)v2.zCoord, -1, texture, 0, 16), - vertexToInts((float)v3.xCoord, (float)v3.yCoord, (float)v3.zCoord, -1, texture, 16, 16), - vertexToInts((float)v4.xCoord, (float)v4.yCoord, (float)v4.zCoord, -1, texture, 16, 0) + vertexToInts((float) v1.xCoord, (float) v1.yCoord, (float) v1.zCoord, -1, texture, 0, 0), + vertexToInts((float) v2.xCoord, (float) v2.yCoord, (float) v2.zCoord, -1, texture, 0, 16), + vertexToInts((float) v3.xCoord, (float) v3.yCoord, (float) v3.zCoord, -1, texture, 16, 16), + vertexToInts((float) v4.xCoord, (float) v4.yCoord, (float) v4.zCoord, -1, texture, 16, 0) ), -1, side, texture, true, DefaultVertexFormats.BLOCK); } @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) { - if(side != null) return ImmutableList.of(); - IExtendedBlockState exState = (IExtendedBlockState)state; + if (side != null) + { + return ImmutableList.of(); + } + IExtendedBlockState exState = (IExtendedBlockState) state; int len = cubeSize * 5 + 1; List ret = new ArrayList(); - for(EnumFacing f : EnumFacing.values()) + for (EnumFacing f : EnumFacing.values()) { ret.add(createSidedBakedQuad(0, 1, 0, 1, 1, base, f)); - if(state != null) + if (state != null) { - for(int i = 0; i < cubeSize; i++) + for (int i = 0; i < cubeSize; i++) { - for(int j = 0; j < cubeSize; j++) + for (int j = 0; j < cubeSize; j++) { Integer value = exState.getValue(properties[f.ordinal()]); - if(value != null && (value & (1 << (i * cubeSize + j))) != 0) + if (value != null && (value & (1 << (i * cubeSize + j))) != 0) { - ret.add(createSidedBakedQuad((float)(1 + i * 5) / len, (float)(5 + i * 5) / len, (float)(1 + j * 5) / len, (float)(5 + j * 5) / len, 1.0001f, overlay, f)); + ret.add(createSidedBakedQuad((float) (1 + i * 5) / len, (float) (5 + i * 5) / len, (float) (1 + j * 5) / len, (float) (5 + j * 5) / len, 1.0001f, overlay, f)); } } } @@ -282,48 +309,78 @@ public class ModelBakeEventDebug } @Override - public boolean isGui3d() { return true; } + public boolean isGui3d() + { + return true; + } @Override - public boolean isAmbientOcclusion() { return true; } + public boolean isAmbientOcclusion() + { + return true; + } @Override - public boolean isBuiltInRenderer() { return false; } + public boolean isBuiltInRenderer() + { + return false; + } @Override - public TextureAtlasSprite getParticleTexture() { return this.base; } + public TextureAtlasSprite getParticleTexture() + { + return this.base; + } @Override - public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + public ItemCameraTransforms getItemCameraTransforms() + { + return ItemCameraTransforms.DEFAULT; + } @Override - public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + public ItemOverrideList getOverrides() + { + return ItemOverrideList.NONE; + } } private static Vec3d rotate(Vec3d vec, EnumFacing side) { - switch(side) + switch (side) { - case DOWN: return new Vec3d( vec.xCoord, -vec.yCoord, -vec.zCoord); - case UP: return new Vec3d( vec.xCoord, vec.yCoord, vec.zCoord); - case NORTH: return new Vec3d( vec.xCoord, vec.zCoord, -vec.yCoord); - case SOUTH: return new Vec3d( vec.xCoord, -vec.zCoord, vec.yCoord); - case WEST: return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord); - case EAST: return new Vec3d( vec.yCoord, -vec.xCoord, vec.zCoord); + case DOWN: + return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord); + case UP: + return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord); + case NORTH: + return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord); + case SOUTH: + return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord); + case WEST: + return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord); + case EAST: + return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord); } throw new IllegalArgumentException("Unknown Side " + side); } private static Vec3d revRotate(Vec3d vec, EnumFacing side) { - switch(side) + switch (side) { - case DOWN: return new Vec3d( vec.xCoord, -vec.yCoord, -vec.zCoord); - case UP: return new Vec3d( vec.xCoord, vec.yCoord, vec.zCoord); - case NORTH: return new Vec3d( vec.xCoord, -vec.zCoord, vec.yCoord); - case SOUTH: return new Vec3d( vec.xCoord, vec.zCoord, -vec.yCoord); - case WEST: return new Vec3d( vec.yCoord, -vec.xCoord, vec.zCoord); - case EAST: return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord); + case DOWN: + return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord); + case UP: + return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord); + case NORTH: + return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord); + case SOUTH: + return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord); + case WEST: + return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord); + case EAST: + return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord); } throw new IllegalArgumentException("Unknown Side " + side); } diff --git a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java b/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java index b71a4a2c47..305ac87fd2 100644 --- a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java @@ -3,9 +3,9 @@ package net.minecraftforge.debug; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; 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; @@ -62,7 +62,9 @@ public class ModelFluidDebug } } - public static class ServerProxy extends CommonProxy {} + public static class ServerProxy extends CommonProxy + { + } public static class ClientProxy extends CommonProxy { diff --git a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java b/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java index b8dce461c0..62ceb87658 100644 --- a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java @@ -1,15 +1,7 @@ package net.minecraftforge.debug; -import java.util.ArrayList; -import java.util.List; - -import javax.vecmath.AxisAngle4d; -import javax.vecmath.Matrix4f; -import javax.vecmath.Quat4f; -import javax.vecmath.Vector3d; -import javax.vecmath.Vector4f; - 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; @@ -26,7 +18,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -48,24 +39,38 @@ 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.fml.common.FMLLog; 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.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; +import org.apache.logging.log4j.Logger; -import com.google.common.collect.Lists; +import javax.vecmath.AxisAngle4d; +import javax.vecmath.Matrix4f; +import javax.vecmath.Quat4f; +import javax.vecmath.Vector3d; +import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.List; @Mod(modid = ModelLoaderRegistryDebug.MODID, name = "ForgeDebugModelLoaderRegistry", version = ModelLoaderRegistryDebug.VERSION, acceptableRemoteVersions = "*") public class ModelLoaderRegistryDebug { + public static final boolean ENABLED = false; public static final String MODID = "forgedebugmodelloaderregistry"; public static final String VERSION = "1.0"; + private static Logger logger; @EventHandler public void preInit(FMLPreInitializationEvent event) { + if (!ENABLED) + { + return; + } + + logger = event.getModLog(); List blocks = Lists.newArrayList(); blocks.add(CustomModelBlock.instance); blocks.add(OBJTesseractBlock.instance); @@ -75,7 +80,7 @@ public class ModelLoaderRegistryDebug blocks.add(OBJDirectionBlock.instance); blocks.add(OBJCustomDataBlock.instance); //blocks.add(OBJDynamicEye.instance); - for(Block block : blocks) + for (Block block : blocks) { GameRegistry.register(block); GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); @@ -84,7 +89,9 @@ public class ModelLoaderRegistryDebug GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name); //GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name); if (event.getSide() == Side.CLIENT) + { clientPreInit(); + } } private void clientPreInit() @@ -133,13 +140,22 @@ public class ModelLoaderRegistryDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) @@ -156,7 +172,7 @@ public class ModelLoaderRegistryDebug @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(FACING)).getIndex(); + return state.getValue(FACING).getIndex(); } @Override @@ -170,11 +186,17 @@ public class ModelLoaderRegistryDebug @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if(world.isRemote) + if (world.isRemote) { - System.out.println("click " + counter); - if(player.isSneaking()) counter--; - else counter++; + logger.info("click " + counter); + if (player.isSneaking()) + { + counter--; + } + else + { + counter++; + } //if(counter >= model.getNode().getKeys().size()) counter = 0; world.markBlockRangeForRenderUpdate(pos, pos); } @@ -189,16 +211,16 @@ public class ModelLoaderRegistryDebug public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) { - if (MathHelper.abs((float)entityIn.posX - (float)clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - (float)clickedBlock.getZ()) < 2.0F) + if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F) { - double d0 = entityIn.posY + (double)entityIn.getEyeHeight(); + double d0 = entityIn.posY + (double) entityIn.getEyeHeight(); - if (d0 - (double)clickedBlock.getY() > 2.0D) + if (d0 - (double) clickedBlock.getY() > 2.0D) { return EnumFacing.UP; } - if ((double)clickedBlock.getY() - d0 > 0.0D) + if ((double) clickedBlock.getY() - d0 > 0.0D) { return EnumFacing.DOWN; } @@ -207,6 +229,7 @@ public class ModelLoaderRegistryDebug return entityIn.getHorizontalFacing().getOpposite(); } } + /** * This block is intended to demonstrate how to change the visibility of a group(s) * from within the block's class. @@ -238,18 +261,30 @@ public class ModelLoaderRegistryDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { - if (world.getTileEntity(pos) == null) world.setTileEntity(pos, new OBJTesseractTileEntity()); + if (world.getTileEntity(pos) == null) + { + world.setTileEntity(pos, new OBJTesseractTileEntity()); + } OBJTesseractTileEntity tileEntity = (OBJTesseractTileEntity) world.getTileEntity(pos); if (player.isSneaking()) @@ -285,7 +320,7 @@ public class ModelLoaderRegistryDebug @Override public BlockStateContainer createBlockState() { - return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] {Properties.AnimationProperty}); + return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{Properties.AnimationProperty}); } } @@ -301,15 +336,15 @@ public class ModelLoaderRegistryDebug @Override public Optional apply(Optional part) { - if(part.isPresent()) + if (part.isPresent()) { // This whole thing is subject to change, but should do for now. UnmodifiableIterator parts = Models.getParts(part.get()); - if(parts.hasNext()) + if (parts.hasNext()) { String name = parts.next(); // only interested in the root level - if(!parts.hasNext() && hidden.contains(name)) + if (!parts.hasNext() && hidden.contains(name)) { return value; } @@ -329,7 +364,10 @@ public class ModelLoaderRegistryDebug this.counter++; this.hidden.add(Integer.toString(this.counter)); TextComponentString text = new TextComponentString("" + this.counter); - if (this.world.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + if (this.world.isRemote) + { + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + } } public void decrement() @@ -342,7 +380,10 @@ public class ModelLoaderRegistryDebug this.hidden.remove(Integer.toString(this.counter)); this.counter--; TextComponentString text = new TextComponentString("" + this.counter); - if (this.world.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + if (this.world.isRemote) + { + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); + } } public void setMax(int max) @@ -375,13 +416,22 @@ public class ModelLoaderRegistryDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } } /** @@ -422,7 +472,7 @@ public class ModelLoaderRegistryDebug @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(FACING)).getIndex(); + return state.getValue(FACING).getIndex(); } @Override @@ -432,26 +482,35 @@ public class ModelLoaderRegistryDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) { - if (MathHelper.abs((float)entityIn.posX - (float)clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - (float)clickedBlock.getZ()) < 2.0F) + if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F) { - double d0 = entityIn.posY + (double)entityIn.getEyeHeight(); + double d0 = entityIn.posY + (double) entityIn.getEyeHeight(); - if (d0 - (double)clickedBlock.getY() > 2.0D) + if (d0 - (double) clickedBlock.getY() > 2.0D) { return EnumFacing.DOWN; } - if ((double)clickedBlock.getY() - d0 > 0.0D) + if ((double) clickedBlock.getY() - d0 > 0.0D) { return EnumFacing.UP; } @@ -507,13 +566,15 @@ public class ModelLoaderRegistryDebug private boolean hasFilledList = false; private boolean shouldIncrement = true; - public OBJVertexColoring2TileEntity() {} + public OBJVertexColoring2TileEntity() + { + } public void cycleColors() { if (this.world.isRemote) { - FMLLog.info("%b", shouldIncrement); + logger.info("%b", shouldIncrement); /* IBakedModel bakedModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(this.world.getBlockState(this.pos), this.world, this.pos); if (bakedModel != null && bakedModel instanceof OBJBakedModel) @@ -585,13 +646,22 @@ public class ModelLoaderRegistryDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override - public boolean causesSuffocation(IBlockState state) { return false; } + public boolean causesSuffocation(IBlockState state) + { + return false; + } @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) @@ -608,7 +678,7 @@ public class ModelLoaderRegistryDebug @Override public int getMetaFromState(IBlockState state) { - return ((EnumFacing) state.getValue(FACING)).getIndex(); + return state.getValue(FACING).getIndex(); } @Override @@ -619,16 +689,16 @@ public class ModelLoaderRegistryDebug public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn) { - if (MathHelper.abs((float)entityIn.posX - (float)clickedBlock.getX()) < 2.0F && MathHelper.abs((float)entityIn.posZ - (float)clickedBlock.getZ()) < 2.0F) + if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F) { - double d0 = entityIn.posY + (double)entityIn.getEyeHeight(); + double d0 = entityIn.posY + (double) entityIn.getEyeHeight(); - if (d0 - (double)clickedBlock.getY() > 2.0D) + if (d0 - (double) clickedBlock.getY() > 2.0D) { return EnumFacing.UP; } - if ((double)clickedBlock.getY() - d0 > 0.0D) + if ((double) clickedBlock.getY() - d0 > 0.0D) { return EnumFacing.DOWN; } @@ -695,7 +765,7 @@ public class ModelLoaderRegistryDebug @Override public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, new IProperty[]{NORTH, SOUTH, WEST, EAST}); + return new BlockStateContainer(this, NORTH, SOUTH, WEST, EAST); } } @@ -709,6 +779,7 @@ public class ModelLoaderRegistryDebug { public static final OBJDynamicEye instance = new OBJDynamicEye(); public static final String name = "obj_dynamic_eye"; + private OBJDynamicEye() { super(Material.IRON); @@ -758,7 +829,7 @@ public class ModelLoaderRegistryDebug @Override public BlockStateContainer createBlockState() { - return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[] {Properties.AnimationProperty}); + return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{Properties.AnimationProperty}); } } @@ -778,7 +849,7 @@ public class ModelLoaderRegistryDebug playerLoc.setY(player.posY + player.getEyeHeight()); playerLoc.setZ(player.posZ); Vector3d lookVec = new Vector3d(playerLoc.getX() - teLoc.getX(), playerLoc.getY() - teLoc.getY(), playerLoc.getZ() - teLoc.getZ()); - double angleYaw = Math.atan2(lookVec.getZ(), lookVec.getX()) - Math.PI/2d; + double angleYaw = Math.atan2(lookVec.getZ(), lookVec.getX()) - Math.PI / 2d; double anglePitch = Math.atan2(lookVec.getY(), Math.sqrt(lookVec.getX() * lookVec.getX() + lookVec.getZ() * lookVec.getZ())); AxisAngle4d yaw = new AxisAngle4d(0, 1, 0, -angleYaw); AxisAngle4d pitch = new AxisAngle4d(1, 0, 0, -anglePitch); diff --git a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java index 133e56295f..67f12f8da8 100644 --- a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java @@ -41,10 +41,16 @@ public class MultiLayerModelDebug } @Override - public boolean isOpaqueCube(IBlockState state) { return false; } + public boolean isOpaqueCube(IBlockState state) + { + return false; + } @Override - public boolean isFullCube(IBlockState state) { return false; } + public boolean isFullCube(IBlockState state) + { + return false; + } @Override public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) @@ -56,7 +62,9 @@ public class MultiLayerModelDebug } } - public static class ServerProxy extends CommonProxy {} + public static class ServerProxy extends CommonProxy + { + } public static class ClientProxy extends CommonProxy { @@ -69,5 +77,8 @@ public class MultiLayerModelDebug } @EventHandler - public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); } + public void preInit(FMLPreInitializationEvent event) + { + proxy.preInit(event); + } } diff --git a/src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java b/src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java new file mode 100644 index 0000000000..a2e4de446f --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java @@ -0,0 +1,34 @@ +package net.minecraftforge.debug; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent; +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 org.apache.logging.log4j.Logger; + +@Mod(modid = "neighbornotifyeventtest", name = "NeighborNotifyEventTest", version = "0.0.0", acceptableRemoteVersions = "*") +public class NeighborNotifyEventTest +{ + + public static final boolean ENABLE = false; + private static Logger logger; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLE) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void onNeighborNotify(NeighborNotifyEvent event) + { + logger.info(event.getPos().toString() + " with face information: " + event.getNotifiedSides()); + event.setCanceled(true); + } +} diff --git a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java similarity index 86% rename from src/test/java/net/minecraftforge/test/NoBedSleepingTest.java rename to src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java index 61d961c4d3..bb582abee7 100644 --- a/src/test/java/net/minecraftforge/test/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; @@ -18,10 +18,10 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.Capability.IStorage; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.ICapabilitySerializable; -import net.minecraftforge.common.capabilities.Capability.IStorage; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; import net.minecraftforge.event.entity.player.SleepingLocationCheckEvent; @@ -56,7 +56,9 @@ public class NoBedSleepingTest } } - public static final class ServerProxy extends CommonProxy {} + public static final class ServerProxy extends CommonProxy + { + } public static final class ClientProxy extends CommonProxy { @@ -80,29 +82,36 @@ public class NoBedSleepingTest public void onEntityConstruct(AttachCapabilitiesEvent.Entity evt) { if (!(evt.getEntity() instanceof EntityPlayer)) + { return; + } evt.addCapability(new ResourceLocation(MODID, "IExtraSleeping"), new ICapabilitySerializable() { IExtraSleeping inst = SLEEP_CAP.getDefaultInstance(); + @Override - public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) + { return capability == SLEEP_CAP; } @Override @Nullable - public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) + { return capability == SLEEP_CAP ? SLEEP_CAP.cast(inst) : null; } @Override - public NBTPrimitive serializeNBT() { - return (NBTPrimitive)SLEEP_CAP.getStorage().writeNBT(SLEEP_CAP, inst, null); + public NBTPrimitive serializeNBT() + { + return (NBTPrimitive) SLEEP_CAP.getStorage().writeNBT(SLEEP_CAP, inst, null); } @Override - public void deserializeNBT(NBTPrimitive nbt) { + public void deserializeNBT(NBTPrimitive nbt) + { SLEEP_CAP.getStorage().readNBT(SLEEP_CAP, inst, null, nbt); } }); @@ -113,7 +122,9 @@ public class NoBedSleepingTest { final IExtraSleeping sleep = evt.getEntityPlayer().getCapability(SLEEP_CAP, null); if (sleep != null && sleep.isSleeping()) + { evt.setResult(Result.ALLOW); + } } @SubscribeEvent @@ -121,12 +132,16 @@ public class NoBedSleepingTest { final IExtraSleeping sleep = evt.getEntityPlayer().getCapability(SLEEP_CAP, null); if (sleep != null) + { sleep.setSleeping(false); + } } } - public interface IExtraSleeping { + public interface IExtraSleeping + { boolean isSleeping(); + void setSleeping(boolean value); } @@ -135,21 +150,31 @@ public class NoBedSleepingTest @Override public NBTBase writeNBT(Capability capability, IExtraSleeping instance, EnumFacing side) { - return new NBTTagByte((byte)(instance.isSleeping() ? 1 : 0)); + return new NBTTagByte((byte) (instance.isSleeping() ? 1 : 0)); } @Override public void readNBT(Capability capability, IExtraSleeping instance, EnumFacing side, NBTBase nbt) { - instance.setSleeping(((NBTPrimitive)nbt).getByte() == 1); + instance.setSleeping(((NBTPrimitive) nbt).getByte() == 1); } } public static class DefaultImpl implements IExtraSleeping { private boolean isSleeping = false; - @Override public boolean isSleeping() { return isSleeping; } - @Override public void setSleeping(boolean value) { this.isSleeping = value; } + + @Override + public boolean isSleeping() + { + return isSleeping; + } + + @Override + public void setSleeping(boolean value) + { + this.isSleeping = value; + } } public static class ItemSleepingPill extends Item @@ -176,7 +201,9 @@ public class NoBedSleepingTest { final IExtraSleeping sleep = player.getCapability(SLEEP_CAP, null); if (sleep != null) + { sleep.setSleeping(true); + } return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } } diff --git a/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java b/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java index 495ae3d5c6..d2b83b9ea7 100644 --- a/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java +++ b/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java @@ -7,25 +7,30 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameData; -@Mod( modid = NoPotionEffectRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*" ) -public class NoPotionEffectRenderTest { - public static final String modID = "nopotioneffect"; +@Mod(modid = NoPotionEffectRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class NoPotionEffectRenderTest +{ + public static final String modID = "nopotioneffect"; - @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); - } - - public static class TestPotion extends Potion { - - public TestPotion(ResourceLocation location, boolean badEffect, int potionColor) { - super(badEffect, potionColor); + @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); } - @Override - public boolean shouldRender(PotionEffect effect) { - return false; + public static class TestPotion extends Potion + { + + public TestPotion(ResourceLocation location, boolean badEffect, int potionColor) + { + super(badEffect, potionColor); + } + + @Override + public boolean shouldRender(PotionEffect effect) + { + return false; + } } - } } diff --git a/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java b/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java index eb0adfa0d1..2a03d472b0 100644 --- a/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java +++ b/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java @@ -13,14 +13,15 @@ import net.minecraftforge.fml.common.registry.IForgeRegistry; import net.minecraftforge.fml.common.registry.IForgeRegistryEntry; import net.minecraftforge.fml.common.registry.RegistryBuilder; -@Mod(modid= ObjectHolderTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*") +@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) { + public void init(FMLInitializationEvent event) + { //verifies @ObjectHolder with custom id assert VanillaObjectHolder.uiButtonClick != null; //verifies modded items work @@ -36,8 +37,10 @@ public class ObjectHolderTest } - protected static class PotionForge extends Potion { - protected PotionForge(ResourceLocation location, boolean badEffect, int potionColor) { + protected static class PotionForge extends Potion + { + protected PotionForge(ResourceLocation location, boolean badEffect, int potionColor) + { super(badEffect, potionColor); setPotionName("potion." + location.getResourcePath()); setRegistryName(location); @@ -45,10 +48,12 @@ public class ObjectHolderTest } @Mod.EventBusSubscriber(modid = MODID) - public static class Registration { + public static class Registration + { @SubscribeEvent - public static void newRegistry(RegistryEvent.NewRegistry event) { - new RegistryBuilder() + public static void newRegistry(RegistryEvent.NewRegistry event) + { + new RegistryBuilder() .setType(ICustomRegistryEntry.class) .setName(new ResourceLocation("object_holder_test_custom_registry")) .setIDRange(0, 255) @@ -56,14 +61,16 @@ public class ObjectHolderTest } @SubscribeEvent - public static void registerPotions(RegistryEvent.Register event) { + public static void registerPotions(RegistryEvent.Register event) + { event.getRegistry().register( new ObjectHolderTest.PotionForge(new ResourceLocation(ObjectHolderTest.MODID, "forge_potion"), false, 0xff00ff) // test automatic id distribution ); } @SubscribeEvent - public static void registerInterfaceRegistryForge(RegistryEvent.Register event) { + public static void registerInterfaceRegistryForge(RegistryEvent.Register event) + { event.getRegistry().register( new CustomRegistryEntry().setRegistryName(new ResourceLocation(MODID, "custom_entry_by_interface")) ); @@ -99,7 +106,8 @@ class CustomRegistryEntry implements ICustomRegistryEntry } } -interface ICustomRegistryEntry extends IForgeRegistryEntry { +interface ICustomRegistryEntry extends IForgeRegistryEntry +{ } diff --git a/src/test/java/net/minecraftforge/test/PermissionTest.java b/src/test/java/net/minecraftforge/debug/PermissionTest.java similarity index 86% rename from src/test/java/net/minecraftforge/test/PermissionTest.java rename to src/test/java/net/minecraftforge/debug/PermissionTest.java index f2a5eef555..1bf1363445 100644 --- a/src/test/java/net/minecraftforge/test/PermissionTest.java +++ b/src/test/java/net/minecraftforge/debug/PermissionTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -87,7 +87,7 @@ public class PermissionTest { EntityPlayerMP player = getCommandSenderAsPlayer(sender); - if(args.length < 1) + if (args.length < 1) { sender.sendMessage(new TextComponentString("claim, unclaim, setblock, read_tile")); return; @@ -95,13 +95,13 @@ public class PermissionTest //Example using BlockPosContext with ChunkPos and permission available to players by default boolean b = args[0].equals("claim"); - if(b || args[0].equals("unclaim")) + if (b || args[0].equals("unclaim")) { ChunkPos chunkPos = new ChunkPos(parseInt(args[1]), parseInt(args[2])); - if(PermissionAPI.hasPermission(player.getGameProfile(), b ? Permissions.CLAIM_CHUNK : Permissions.UNCLAIM_CHUNK, new BlockPosContext(player, chunkPos))) + if (PermissionAPI.hasPermission(player.getGameProfile(), b ? Permissions.CLAIM_CHUNK : Permissions.UNCLAIM_CHUNK, new BlockPosContext(player, chunkPos))) { - if(b) + if (b) { //claim chunk sender.sendMessage(new TextComponentString("Chunk claimed!")); @@ -118,9 +118,9 @@ public class PermissionTest } } //Example using BlockPosContext and permission available to only OPs by default - else if(args[0].equals("setblock")) + else if (args[0].equals("setblock")) { - if(args.length < 5) + if (args.length < 5) { throw new WrongUsageException("commands.setblock.usage"); } @@ -129,12 +129,12 @@ public class PermissionTest Block block = CommandBase.getBlockByText(sender, args[4]); int i = 0; - if(args.length >= 6) + if (args.length >= 6) { i = parseInt(args[5], 0, 15); } - if(!player.world.isBlockLoaded(blockpos)) + if (!player.world.isBlockLoaded(blockpos)) { throw new CommandException("commands.setblock.outOfWorld"); } @@ -142,23 +142,23 @@ public class PermissionTest { IBlockState state = block.getStateFromMeta(i); - if(!PermissionAPI.hasPermission(player.getGameProfile(), Permissions.SET_BLOCK, new BlockPosContext(player, blockpos, state, null))) + if (!PermissionAPI.hasPermission(player.getGameProfile(), Permissions.SET_BLOCK, new BlockPosContext(player, blockpos, state, null))) { throw new CommandException("commands.generic.permission"); } - else if(!player.world.setBlockState(blockpos, state, 2)) + else if (!player.world.setBlockState(blockpos, state, 2)) { throw new CommandException("commands.setblock.noChange"); } } } //Example using custom ContextKey and permission available to only OPs by default - else if(args[0].equals("read_tile")) + else if (args[0].equals("read_tile")) { BlockPos blockpos = parseBlockPos(sender, args, 1, false); TileEntity tileEntity = player.world.getTileEntity(blockpos); - if(PermissionAPI.hasPermission(player.getGameProfile(), Permissions.READ_TILE, new BlockPosContext(player, blockpos, null, null).set(ContextKeys.TILE_ENTITY, tileEntity))) + if (PermissionAPI.hasPermission(player.getGameProfile(), Permissions.READ_TILE, new BlockPosContext(player, blockpos, null, null).set(ContextKeys.TILE_ENTITY, tileEntity))) { NBTTagCompound tag = tileEntity == null ? null : tileEntity.serializeNBT(); sender.sendMessage(new TextComponentString(String.valueOf(tag))); diff --git a/src/test/java/net/minecraftforge/test/PlayerDamageReworkTest.java b/src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java similarity index 95% rename from src/test/java/net/minecraftforge/test/PlayerDamageReworkTest.java rename to src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java index 133f37d9f8..25c360954c 100644 --- a/src/test/java/net/minecraftforge/test/PlayerDamageReworkTest.java +++ b/src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import java.util.UUID; @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0") +@Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0", acceptableRemoteVersions = "*") public class PlayerDamageReworkTest { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java similarity index 91% rename from src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java rename to src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java index 4dea7c2ed4..a4e98e7c00 100644 --- a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java @@ -1,7 +1,6 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.entity.item.EntityArmorStand; -import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.init.Items; @@ -15,18 +14,17 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; 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.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid="playerinteracteventtest", name="PlayerInteractEventTest", version="0.0.0", acceptableRemoteVersions = "*") +@Mod(modid = "playerinteracteventtest", name = "PlayerInteractEventTest", version = "0.0.0", acceptableRemoteVersions = "*") public class PlayerInteractEventTest { // NOTE: Test with both this ON and OFF - ensure none of the test behaviours show when this is off! private static final boolean ENABLE = false; - private Logger logger; + private static Logger logger; @EventHandler public void preinit(FMLPreInitializationEvent event) @@ -39,7 +37,10 @@ public class PlayerInteractEventTest @SubscribeEvent(receiveCanceled = true) // this triggers after the subclasses below, and we'd like to log them all public void global(PlayerInteractEvent evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } logger.info("{} | {}", evt.getClass().getSimpleName(), evt.getSide().name()); logger.info("{} | stack: {}", evt.getHand(), evt.getItemStack()); logger.info("{} | face: {}", evt.getPos(), evt.getFace()); @@ -48,17 +49,26 @@ public class PlayerInteractEventTest @SubscribeEvent public void leftClickBlock(PlayerInteractEvent.LeftClickBlock evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } logger.info("HIT VEC: {}", evt.getHitVec()); if (!evt.getItemStack().isEmpty()) { if (evt.getItemStack().getItem() == Items.GOLDEN_PICKAXE) + { evt.setCanceled(true); // Redstone should not activate and pick should not be able to dig anything + } if (evt.getItemStack().getItem() == Items.DIAMOND_PICKAXE) + { evt.setUseBlock(Event.Result.DENY); // Redstone should not activate, pick should still dig + } if (evt.getItemStack().getItem() == Items.IRON_PICKAXE) + { evt.setUseItem(Event.Result.DENY); // Pick should not dig, Redstone should still activate + } } // When item use denied, the event will keep firing as long as the left click button is held. @@ -69,7 +79,10 @@ public class PlayerInteractEventTest @SubscribeEvent public void rightClickBlock(PlayerInteractEvent.RightClickBlock evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } logger.info("HIT VEC: {}", evt.getHitVec()); // Shift right clicking dropper with an item in hand should still open the dropper contrary to normal mechanics @@ -92,11 +105,14 @@ public class PlayerInteractEventTest // Note that if you do this on a chest, the f+s will fail, but then your off hand will open the chest // If you dual wield flints and steels and right click a chest nothing should happen if (!evt.getItemStack().isEmpty() && evt.getItemStack().getItem() == Items.FLINT_AND_STEEL) + { evt.setUseBlock(Event.Result.DENY); + } // Case: Painting in main hand // Opening a TE will also place a painting on the TE if possible - if (evt.getHand() == EnumHand.MAIN_HAND && !evt.getItemStack().isEmpty() && evt.getItemStack().getItem() == Items.PAINTING) { + if (evt.getHand() == EnumHand.MAIN_HAND && !evt.getItemStack().isEmpty() && evt.getItemStack().getItem() == Items.PAINTING) + { evt.setUseItem(Event.Result.ALLOW); } @@ -105,7 +121,8 @@ public class PlayerInteractEventTest && evt.getItemStack().getItem() == Items.SPAWN_EGG && evt.getHand() == EnumHand.MAIN_HAND && !evt.getEntityPlayer().getHeldItemOffhand().isEmpty() - && evt.getEntityPlayer().getHeldItemOffhand().getItem() instanceof ItemBlock) { + && evt.getEntityPlayer().getHeldItemOffhand().getItem() instanceof ItemBlock) + { evt.setCanceled(true); } @@ -114,7 +131,8 @@ public class PlayerInteractEventTest && evt.getItemStack().getItem() == Items.SPAWN_EGG && evt.getHand() == EnumHand.MAIN_HAND && !evt.getEntityPlayer().getHeldItemOffhand().isEmpty() - && evt.getEntityPlayer().getHeldItemOffhand().getItem() == Items.SPLASH_POTION) { + && evt.getEntityPlayer().getHeldItemOffhand().getItem() == Items.SPLASH_POTION) + { evt.setCanceled(true); // Fake spawn egg success so splash potion does not trigger evt.setCancellationResult(EnumActionResult.SUCCESS); @@ -124,7 +142,10 @@ public class PlayerInteractEventTest @SubscribeEvent public void rightClickItem(PlayerInteractEvent.RightClickItem evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } // Case: Ender pearl in main hand, block in offhand -> Block is NOT placed if (!evt.getItemStack().isEmpty() @@ -149,13 +170,18 @@ public class PlayerInteractEventTest @SubscribeEvent public void interactSpecific(PlayerInteractEvent.EntityInteractSpecific evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } logger.info("LOCAL POS: {}", evt.getLocalPos()); if (!evt.getItemStack().isEmpty() && evt.getTarget() instanceof EntityArmorStand && evt.getItemStack().getItem() == Items.IRON_HELMET) + { evt.setCanceled(true); // Should not be able to place iron helmet onto armor stand (you will put it on instead) + } if (!evt.getItemStack().isEmpty() && evt.getTarget() instanceof EntityArmorStand @@ -180,13 +206,19 @@ public class PlayerInteractEventTest @SubscribeEvent public static void interactNormal(PlayerInteractEvent.EntityInteract evt) { - if (!ENABLE) return; + if (!ENABLE) + { + return; + } - if (!evt.getItemStack().isEmpty() && evt.getTarget() instanceof EntityHorse) { + if (!evt.getItemStack().isEmpty() && evt.getTarget() instanceof EntityHorse) + { // Should not be able to feed wild horses with golden apple (you will start eating it in survival) if (evt.getItemStack().getItem() == Items.GOLDEN_APPLE && evt.getItemStack().getItemDamage() == 0) + { evt.setCanceled(true); + } // Should not be able to feed wild horses with notch apple but you will NOT eat it if (evt.getItemStack().getItem() == Items.GOLDEN_APPLE && evt.getItemStack().getItemDamage() == 1) diff --git a/src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java b/src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java new file mode 100644 index 0000000000..86d5353e52 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java @@ -0,0 +1,33 @@ +package net.minecraftforge.debug; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerSetSpawnEvent; +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 org.apache.logging.log4j.Logger; + +@Mod(modid = "playersetspawntest", name = "Player Set Spawn Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class PlayerSetSpawnTest +{ + private static final boolean ENABLE = false; + private static Logger logger; + + @EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLE) + { + logger = event.getModLog(); + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void onPlayerSetSpawn(PlayerSetSpawnEvent event) + { + logger.info(event.isForced() + " " + event.getNewSpawn().toString()); + event.setCanceled(true); + } +} diff --git a/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java b/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java index d8b2c18a9a..0920e6247a 100644 --- a/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java +++ b/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java @@ -1,6 +1,5 @@ package net.minecraftforge.debug; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; @@ -24,14 +23,20 @@ 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) +@Mod(modid = PotionCurativeItemDebug.MOD_ID, 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"; @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { + if (!ENABLED) + { + return; + } + Item medicine = new Medicine().setRegistryName(MOD_ID, "medicine"); GameRegistry.register(medicine); diff --git a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java b/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java index ac6025d972..e4354d857e 100644 --- a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java @@ -2,9 +2,6 @@ package net.minecraftforge.debug; import gnu.trove.set.TIntSet; import gnu.trove.set.hash.TIntHashSet; - -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -20,98 +17,107 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameData; +import java.util.Random; + @Mod(modid = PotionRegistryDebug.MODID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*") -public class PotionRegistryDebug { - public static final String MODID = "forgepotionregistry"; +public class PotionRegistryDebug +{ + public static final String MODID = "forgepotionregistry"; - @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); + @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); - Random rand = new Random(); - TIntSet taken = new TIntHashSet(100); - int ra = rand.nextInt(100) + 100; - taken.add(ra); + Random rand = new Random(); + TIntSet taken = new TIntHashSet(100); + int ra = rand.nextInt(100) + 100; + taken.add(ra); - // a new potion with a random id so that forge has to remap it - //new PotionForge(ra, new ResourceLocation(ForgeModContainer.MOD_ID, "realRandomPotion"), false, 0x0000ff); + // a new potion with a random id so that forge has to remap it + //new PotionForge(ra, new ResourceLocation(ForgeModContainer.MOD_ID, "realRandomPotion"), false, 0x0000ff); - for(int i = 0; i < 20; i++) { - int r = rand.nextInt(200) + 35; - while(taken.contains(r)) - r = rand.nextInt(200) + 35; - //r = 32+i; - taken.add(r); - // this potions will most likely not have the same IDs between server and client. - // The forge handshake on connect should fix this. - //new PotionForge(new ResourceLocation(ForgeModContainer.MOD_ID, "randomPotion" + r), false, 0xff00ff); - } - } - - protected class PotionForge extends Potion { - protected PotionForge(ResourceLocation location, boolean badEffect, int potionColor) { - super(badEffect, potionColor); - setPotionName("potion." + location.getResourcePath()); + for (int i = 0; i < 20; i++) + { + int r = rand.nextInt(200) + 35; + while (taken.contains(r)) + r = rand.nextInt(200) + 35; + //r = 32+i; + taken.add(r); + // this potions will most likely not have the same IDs between server and client. + // The forge handshake on connect should fix this. + //new PotionForge(new ResourceLocation(ForgeModContainer.MOD_ID, "randomPotion" + r), false, 0xff00ff); + } } - @Override - public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) { - Potion potion = effect.getPotion(); + protected class PotionForge extends Potion + { + protected PotionForge(ResourceLocation location, boolean badEffect, int potionColor) + { + super(badEffect, potionColor); + setPotionName("potion." + location.getResourcePath()); + } - mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/fire_layer_0"); + @Override + public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) + { + Potion potion = effect.getPotion(); - x += 6; - y += 7; + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/fire_layer_0"); - int width = 18; - int height = width; + x += 6; + y += 7; - float r = (float)(potion.getLiquidColor() >> 24 & 255) / 255.0F; - float g = (float)(potion.getLiquidColor() >> 16 & 255) / 255.0F; - float b = (float)(potion.getLiquidColor() >> 8 & 255) / 255.0F; - float a = (float)(potion.getLiquidColor() & 255) / 255.0F; + int width = 18; + int height = width; - Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer buf = tessellator.getBuffer(); - buf.begin(7, DefaultVertexFormats.POSITION_TEX); - GlStateManager.color(r, g, b, a); - buf.pos((double) x, (double)(y + height), 0.0D).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double)(y + height), 0.0D).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double) y, 0.0D).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); - buf.pos((double) x, (double) y, 0.0D).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); - tessellator.draw(); + float r = (float) (potion.getLiquidColor() >> 24 & 255) / 255.0F; + float g = (float) (potion.getLiquidColor() >> 16 & 255) / 255.0F; + float b = (float) (potion.getLiquidColor() >> 8 & 255) / 255.0F; + float a = (float) (potion.getLiquidColor() & 255) / 255.0F; + + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer buf = tessellator.getBuffer(); + buf.begin(7, DefaultVertexFormats.POSITION_TEX); + GlStateManager.color(r, g, b, a); + buf.pos((double) x, (double) (y + height), 0.0D).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + buf.pos((double) (x + width), (double) (y + height), 0.0D).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + buf.pos((double) (x + width), (double) y, 0.0D).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + buf.pos((double) x, (double) y, 0.0D).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); + tessellator.draw(); + } + + @Override + public void renderHUDEffect(int x, int y, PotionEffect effect, Minecraft mc, float alpha) + { + Potion potion = effect.getPotion(); + + mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); + TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/tnt_side"); + + x += 3; + y += 3; + + int width = 18; + int height = width; + + float r = (float) (potion.getLiquidColor() >> 24 & 255) / 255.0F; + float g = (float) (potion.getLiquidColor() >> 16 & 255) / 255.0F; + float b = (float) (potion.getLiquidColor() >> 8 & 255) / 255.0F; + + Tessellator tessellator = Tessellator.getInstance(); + VertexBuffer buf = tessellator.getBuffer(); + buf.begin(7, DefaultVertexFormats.POSITION_TEX); + GlStateManager.color(r, g, b, alpha); + buf.pos((double) x, (double) (y + height), 0.0D).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + buf.pos((double) (x + width), (double) (y + height), 0.0D).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + buf.pos((double) (x + width), (double) y, 0.0D).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + buf.pos((double) x, (double) y, 0.0D).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); + tessellator.draw(); + } } - - @Override - public void renderHUDEffect(int x, int y, PotionEffect effect, Minecraft mc, float alpha) { - Potion potion = effect.getPotion(); - - mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/tnt_side"); - - x += 3; - y += 3; - - int width = 18; - int height = width; - - float r = (float)(potion.getLiquidColor() >> 24 & 255) / 255.0F; - float g = (float)(potion.getLiquidColor() >> 16 & 255) / 255.0F; - float b = (float)(potion.getLiquidColor() >> 8 & 255) / 255.0F; - - Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer buf = tessellator.getBuffer(); - buf.begin(7, DefaultVertexFormats.POSITION_TEX); - GlStateManager.color(r, g, b, alpha); - buf.pos((double) x, (double)(y + height), 0.0D).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double)(y + height), 0.0D).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double) y, 0.0D).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); - buf.pos((double) x, (double) y, 0.0D).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); - tessellator.draw(); - } - } } diff --git a/src/test/java/net/minecraftforge/test/TestCapabilityMod.java b/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java similarity index 80% rename from src/test/java/net/minecraftforge/test/TestCapabilityMod.java rename to src/test/java/net/minecraftforge/debug/TestCapabilityMod.java index 8850bb266d..c73ea452a1 100644 --- a/src/test/java/net/minecraftforge/test/TestCapabilityMod.java +++ b/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java @@ -1,8 +1,5 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; -import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -29,6 +26,11 @@ 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.gameevent.TickEvent; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; @Mod(modid = "forge.testcapmod", name = "Forge TestCapMod", version = "1.0", acceptableRemoteVersions = "*") public class TestCapabilityMod @@ -41,20 +43,26 @@ public class TestCapabilityMod @CapabilityInject(IExampleCapability.class) private static final Capability TEST_CAP = null; + private static Logger logger; + @Mod.EventHandler public void preinit(FMLPreInitializationEvent evt) { + logger = evt.getModLog(); // If you are a API, provide register your capability ASAP. // You MUST supply a default save handler and a default implementation // If you are a CONSUMER of the capability DO NOT register it. Only APIs should. - CapabilityManager.INSTANCE.register(IExampleCapability.class, new Storage(), DefaultImpl.class); + CapabilityManager.INSTANCE.register(IExampleCapability.class, new Storage(), DefaultImpl.class); MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent public void onInteract(PlayerInteractEvent.LeftClickBlock event) { - if (event.getItemStack().getItem() != Items.STICK) return; + if (event.getItemStack().getItem() != Items.STICK) + { + return; + } // This is just a example of how to interact with the TE, note the strong type binding that getCapability has TileEntity te = event.getWorld().getTileEntity(event.getPos()); @@ -62,7 +70,7 @@ public class TestCapabilityMod { event.setCanceled(true); IExampleCapability inv = te.getCapability(TEST_CAP, event.getFace()); - System.out.println("Hi I'm a " + inv.getOwnerType()); + logger.info("Hi I'm a " + inv.getOwnerType()); } if (event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.DIRT && event.getItemStack().hasCapability(TEST_CAP, null)) { @@ -75,13 +83,16 @@ public class TestCapabilityMod @SubscribeEvent public void onInteractItem(PlayerInteractEvent.RightClickItem event) { - if (!event.getEntityPlayer().isSneaking()) return; + if (!event.getEntityPlayer().isSneaking()) + { + return; + } if (event.getItemStack().hasCapability(TEST_CAP, null)) { IExampleCapability cap = event.getItemStack().getCapability(TEST_CAP, null); cap.toggleVal(); - System.out.println("Test value is now: " + (cap.getVal() ? "TRUE" : "FALSE")); + logger.info("Test value is now: " + (cap.getVal() ? "TRUE" : "FALSE")); } } @@ -91,7 +102,7 @@ public class TestCapabilityMod @CapabilityInject(IExampleCapability.class) private static void capRegistered(Capability cap) { - System.out.println("IExampleCapability was registered wheeeeee!"); + logger.info("IExampleCapability was registered wheeeeee!"); } // Having the Provider implement the cap is not recommended as this creates a hard dep on the cap interface. @@ -106,38 +117,53 @@ public class TestCapabilityMod { this.obj = obj; } + @Override public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return TEST_CAP != null && capability == TEST_CAP; } + @Override @Nullable public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { - if (TEST_CAP != null && capability == TEST_CAP) return TEST_CAP.cast(this); + if (TEST_CAP != null && capability == TEST_CAP) + { + return TEST_CAP.cast(this); + } return null; } + @Override - public NBTTagCompound serializeNBT() { + public NBTTagCompound serializeNBT() + { NBTTagCompound tag = new NBTTagCompound(); tag.setBoolean("CapTestVal", this.value); return tag; } + @Override - public void deserializeNBT(NBTTagCompound tag) { + public void deserializeNBT(NBTTagCompound tag) + { this.value = tag.getBoolean("CapTestVal"); } + @Override - public String getOwnerType() { + public String getOwnerType() + { return obj.getClass().getName(); } + @Override - public boolean getVal() { + public boolean getVal() + { return this.value; } + @Override - public void toggleVal() { + public void toggleVal() + { this.value = !this.value; } } @@ -158,7 +184,9 @@ public class TestCapabilityMod public void onItemLoad(AttachCapabilitiesEvent event) { if (event.getObject().getItem() == Items.STICK) + { event.addCapability(new ResourceLocation("forge.testcapmod:dummy_cap"), new Provider(event.getObject())); + } } // these can be removed if we remove these legacy events @@ -166,14 +194,18 @@ public class TestCapabilityMod public void onItemLoadLegacy(AttachCapabilitiesEvent event) { if (event.getObject() == Items.APPLE) + { event.addCapability(new ResourceLocation("forge.testcapmod:dummy_cap"), new Provider(event.getObject())); + } } @SubscribeEvent public void onItemLoadLegacy(AttachCapabilitiesEvent.Item event) { if (event.getObject() == Items.ARROW) + { event.addCapability(new ResourceLocation("forge.testcapmod:dummy_cap"), new Provider(event.getObject())); + } } @@ -188,9 +220,11 @@ public class TestCapabilityMod public void attachTileEntity(AttachCapabilitiesEvent event) { if (!(event.getObject() instanceof TileEntity)) + { throw new IllegalArgumentException("Generic event handler failed! Expected Tile Entity got " + event.getObject()); + } } - + @SubscribeEvent public void attachVillage(AttachCapabilitiesEvent event) { @@ -202,36 +236,35 @@ public class TestCapabilityMod @SubscribeEvent public void tick(TickEvent.WorldTickEvent event) { - if(!event.world.isRemote) + if (!event.world.isRemote) { List players = event.world.playerEntities; int i = 0; - for(Village village : event.world.villageCollectionObj.getVillageList()) + for (Village village : event.world.villageCollectionObj.getVillageList()) { - if(village.hasCapability(TEST_CAP, null)) + if (village.hasCapability(TEST_CAP, null)) { boolean playerInRadius = false; - for(EntityPlayer player : players) + for (EntityPlayer player : players) { - - if(new Vec3d(player.posX, 0, player.posZ).squareDistanceTo(new Vec3d(village.getCenter().getX(), 0, village.getCenter().getZ())) <= village.getVillageRadius() * village.getVillageRadius()) + if (new Vec3d(player.posX, 0, player.posZ).squareDistanceTo(new Vec3d(village.getCenter().getX(), 0, village.getCenter().getZ())) <= village.getVillageRadius() * village.getVillageRadius()) { playerInRadius = playerInRadius || true; } } //If the test cap is true but no players are in radius - if(village.getCapability(TEST_CAP, null).getVal() && !playerInRadius) - { - village.getCapability(TEST_CAP, null).toggleVal(); - for(EntityPlayer player : players) - player.sendMessage(new TextComponentString(TextFormatting.RED + "All Players Have Exited Village " + i)); - } - //If the test cap is false but there are players in radius - else if(!village.getCapability(TEST_CAP, null).getVal() && playerInRadius) + if (village.getCapability(TEST_CAP, null).getVal() && !playerInRadius) { village.getCapability(TEST_CAP, null).toggleVal(); - for(EntityPlayer player : players) - player.sendMessage(new TextComponentString(TextFormatting.GREEN + "Some Players Have Entered Village " + i)); + for (EntityPlayer player : players) + player.sendMessage(new TextComponentString(TextFormatting.RED + "All Players Have Exited Village " + i)); + } + //If the test cap is false but there are players in radius + else if (!village.getCapability(TEST_CAP, null).getVal() && playerInRadius) + { + village.getCapability(TEST_CAP, null).toggleVal(); + for (EntityPlayer player : players) + player.sendMessage(new TextComponentString(TextFormatting.GREEN + "Some Players Have Entered Village " + i)); } } i++; @@ -240,10 +273,12 @@ public class TestCapabilityMod } // Capabilities SHOULD be interfaces, NOT concrete classes, this allows for // the most flexibility for the implementors. - public static interface IExampleCapability + public interface IExampleCapability { String getOwnerType(); + boolean getVal(); + void toggleVal(); } @@ -254,26 +289,35 @@ public class TestCapabilityMod public static class Storage implements IStorage { @Override - public NBTBase writeNBT(Capability capability, IExampleCapability instance, EnumFacing side) { + public NBTBase writeNBT(Capability capability, IExampleCapability instance, EnumFacing side) + { return null; } @Override - public void readNBT(Capability capability, IExampleCapability instance, EnumFacing side, NBTBase nbt) { + public void readNBT(Capability capability, IExampleCapability instance, EnumFacing side, NBTBase nbt) + { } } // You MUST also supply a default implementation. // This is to make life easier on consumers. - public static class DefaultImpl implements IExampleCapability { + public static class DefaultImpl implements IExampleCapability + { @Override - public String getOwnerType(){ + public String getOwnerType() + { return "Default Implementation!"; } - public boolean getVal() { + + public boolean getVal() + { return false; } + @Override - public void toggleVal() {} + public void toggleVal() + { + } } } diff --git a/src/test/java/net/minecraftforge/debug/TextureDump.java b/src/test/java/net/minecraftforge/debug/TextureDump.java index 48af310271..f34064396f 100644 --- a/src/test/java/net/minecraftforge/debug/TextureDump.java +++ b/src/test/java/net/minecraftforge/debug/TextureDump.java @@ -1,37 +1,37 @@ package net.minecraftforge.debug; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.apache.logging.log4j.Logger; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; import java.nio.IntBuffer; -import javax.imageio.ImageIO; - -import net.minecraftforge.fml.common.FMLLog; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; - -@Mod(modid = TextureDump.MODID, name = "Forge Texture Atlas Dump", version = TextureDump.VERSION, clientSideOnly = true, acceptableRemoteVersions = "*") +@Mod(modid = TextureDump.MODID, name = "Forge Texture Atlas Dump", version = TextureDump.VERSION, clientSideOnly = true) public class TextureDump { public static final String MODID = "forge_texture_dump"; public static final String VERSION = "1.0"; - public static final boolean ENABLE = true; + public static final boolean ENABLE = false; + private static Logger logger; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { if (ENABLE) { + logger = event.getModLog(); MinecraftForge.EVENT_BUS.register(this); } } @@ -71,11 +71,11 @@ public class TextureDump try { ImageIO.write(bufferedimage, "png", output); - FMLLog.info("[TextureDump] Exported png to: %s", output.getAbsolutePath()); + logger.info("Exported png to: %s", output.getAbsolutePath()); } catch (IOException ioexception) { - FMLLog.info("[TextureDump] Unable to write: ", ioexception); + logger.info("Unable to write: ", ioexception); } } } diff --git a/src/test/java/net/minecraftforge/test/TileEntityLoadingTest.java b/src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java similarity index 74% rename from src/test/java/net/minecraftforge/test/TileEntityLoadingTest.java rename to src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java index a24d9ebf12..02106573d4 100644 --- a/src/test/java/net/minecraftforge/test/TileEntityLoadingTest.java +++ b/src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -14,9 +14,10 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; -@Mod(modid = TileEntityLoadingTest.MOD_ID, name = "TileEntity#onLoad() test mod", version = "1.0") +@Mod(modid = TileEntityLoadingTest.MOD_ID, 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 boolean DEBUG = false; @@ -26,10 +27,13 @@ public class TileEntityLoadingTest @Mod.EventHandler public static void preInit(FMLPreInitializationEvent event) { - logger = event.getModLog(); - GameRegistry.register(testBlock); - GameRegistry.register(new ItemBlock(testBlock).setRegistryName(testBlock.getRegistryName())); - GameRegistry.registerTileEntity(TestTE.class, testBlock.getRegistryName().toString()); + 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 @@ -64,7 +68,10 @@ public class TileEntityLoadingTest public void onLoad() { logger.info("World: " + world + ", Pos: " + pos + ", State: " + world.getBlockState(pos)); - if (DEBUG) logger.trace("Stack trace:", new Exception()); + if (DEBUG) + { + logger.trace("Stack trace:", new Exception()); + } } } } diff --git a/src/test/java/net/minecraftforge/test/VillagerProfessionTest.java b/src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java similarity index 96% rename from src/test/java/net/minecraftforge/test/VillagerProfessionTest.java rename to src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java index 946830107c..a058212892 100644 --- a/src/test/java/net/minecraftforge/test/VillagerProfessionTest.java +++ b/src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/test/java/net/minecraftforge/test/WRNormalMod.java b/src/test/java/net/minecraftforge/debug/WRNormalMod.java similarity index 99% rename from src/test/java/net/minecraftforge/test/WRNormalMod.java rename to src/test/java/net/minecraftforge/debug/WRNormalMod.java index 1e51b3779a..8065fbccb4 100644 --- a/src/test/java/net/minecraftforge/test/WRNormalMod.java +++ b/src/test/java/net/minecraftforge/debug/WRNormalMod.java @@ -1,9 +1,9 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderLivingBase; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.util.ResourceLocation; @@ -11,9 +11,9 @@ import net.minecraft.world.World; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; 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.registry.EntityRegistry; diff --git a/src/test/java/net/minecraftforge/test/WorldCapabilityRainTimerTest.java b/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java similarity index 81% rename from src/test/java/net/minecraftforge/test/WorldCapabilityRainTimerTest.java rename to src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java index 095d2db6ef..bb228b89f6 100644 --- a/src/test/java/net/minecraftforge/test/WorldCapabilityRainTimerTest.java +++ b/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java @@ -1,4 +1,4 @@ -package net.minecraftforge.test; +package net.minecraftforge.debug; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -20,9 +20,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import javax.annotation.Nonnull; import javax.annotation.Nullable; -/** Simple mod to test world capability, by adding timer logic and check for raining time. */ -@Mod(modid=WorldCapabilityRainTimerTest.MODID, name="World Periodic Rain Check Test", version="0.0.0", acceptableRemoteVersions = "*") -public class WorldCapabilityRainTimerTest { +/** + * Simple mod to test world capability, by adding timer logic and check for raining time. + */ +@Mod(modid = WorldCapabilityRainTimerTest.MODID, name = "World Periodic Rain Check Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class WorldCapabilityRainTimerTest +{ public static final String MODID = "worldperiodicrainchecktest"; @CapabilityInject(IRainTimer.class) @@ -41,34 +44,48 @@ public class WorldCapabilityRainTimerTest { public void attatchTimer(AttachCapabilitiesEvent.World event) { if (!event.getWorld().isRemote && !event.getWorld().provider.hasNoSky()) + { event.addCapability(new ResourceLocation(MODID, "rainTimer"), new RainTimerProvider()); + } } @SubscribeEvent public void onTick(TickEvent.WorldTickEvent event) { - if(event.world.isRemote) + if (event.world.isRemote) + { return; + } IRainTimer timer = event.world.getCapability(TIMER_CAP, null); if (timer == null) + { return; + } if (event.phase == TickEvent.Phase.END) + { timer.onTick(); + } if (event.phase == TickEvent.Phase.START) { - if(event.world.isRaining()) + if (event.world.isRaining()) { if (timer.getDuration() == 0) + { timer.refreshTimer(1000, 0); + } else if (timer.isTimerReachedDuration()) + { event.world.provider.resetRainAndThunder(); + } } else + { timer.refreshTimer(0, 0); + } } } } @@ -76,10 +93,13 @@ public class WorldCapabilityRainTimerTest { public interface IRainTimer { public int getCurrentTime(); + public int getDuration(); public void refreshTimer(int duration, int initial); + public void resetTimer(); + public boolean isTimerReachedDuration(); public void onTick(); @@ -88,7 +108,8 @@ public class WorldCapabilityRainTimerTest { public static class TimerStorage implements IStorage { @Override - public NBTBase writeNBT(Capability capability, IRainTimer instance, EnumFacing side) { + public NBTBase writeNBT(Capability capability, IRainTimer instance, EnumFacing side) + { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("current", instance.getCurrentTime()); compound.setInteger("duration", instance.getDuration()); @@ -96,7 +117,8 @@ public class WorldCapabilityRainTimerTest { } @Override - public void readNBT(Capability capability, IRainTimer instance, EnumFacing side, NBTBase nbt) { + public void readNBT(Capability capability, IRainTimer instance, EnumFacing side, NBTBase nbt) + { NBTTagCompound data = (NBTTagCompound) nbt; instance.refreshTimer(data.getInteger("duration"), data.getInteger("current")); } @@ -107,9 +129,16 @@ public class WorldCapabilityRainTimerTest { private int duration, current; @Override - public int getCurrentTime() { return this.current; } + public int getCurrentTime() + { + return this.current; + } + @Override - public int getDuration() { return this.duration; } + public int getDuration() + { + return this.duration; + } @Override public void refreshTimer(int duration, int initial) @@ -123,6 +152,7 @@ public class WorldCapabilityRainTimerTest { { this.current = 0; } + @Override public boolean isTimerReachedDuration() { @@ -132,8 +162,10 @@ public class WorldCapabilityRainTimerTest { @Override public void onTick() { - if(this.current < this.duration) + if (this.current < this.duration) + { this.current++; + } } } @@ -151,7 +183,7 @@ public class WorldCapabilityRainTimerTest { @Nullable public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { - return capability == TIMER_CAP? TIMER_CAP.cast(this.timer) : null; + return capability == TIMER_CAP ? TIMER_CAP.cast(this.timer) : null; } @Override diff --git a/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java b/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java index 412f1de617..e078ddbcbd 100644 --- a/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java +++ b/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = WrenchRotateDebug.modID, name = "Wrench Rotate Debug", version = "0.0.0") +@Mod(modid = WrenchRotateDebug.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*") public class WrenchRotateDebug { public static final String modID = "wrenchrotatedebug"; diff --git a/src/test/java/net/minecraftforge/fml/common/registry/BlockStateMappingsTest.java b/src/test/java/net/minecraftforge/fml/common/registry/BlockStateMappingsTest.java index d2c9496590..83e12de35a 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/BlockStateMappingsTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/BlockStateMappingsTest.java @@ -1,17 +1,9 @@ package net.minecraftforge.fml.common.registry; import net.minecraft.block.Block; -import net.minecraft.block.BlockDirt; -import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.properties.PropertyInteger; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.init.Bootstrap; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.DummyModContainer; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModMetadata; @@ -19,8 +11,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import javax.annotation.Nonnull; - import static org.junit.Assert.assertEquals; /** @@ -36,7 +26,8 @@ public class BlockStateMappingsTest System.setProperty("fml.doNotBackup", "true"); Loader.instance(); Bootstrap.register(); - Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() {{ + Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() + {{ modId = "test"; }})); } diff --git a/src/test/java/net/minecraftforge/fml/common/registry/DummyBlockReplacementTest.java b/src/test/java/net/minecraftforge/fml/common/registry/DummyBlockReplacementTest.java index 225f9cffa8..7fe54876c0 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/DummyBlockReplacementTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/DummyBlockReplacementTest.java @@ -23,7 +23,8 @@ import static org.junit.Assert.*; public class DummyBlockReplacementTest { private ResourceLocation myDirt = new ResourceLocation("test:dirt"); - private BlockDirt testDirtBlock = new BlockDirt() { + private BlockDirt testDirtBlock = new BlockDirt() + { }; @@ -34,7 +35,8 @@ public class DummyBlockReplacementTest System.setProperty("fml.doNotBackup", "true"); Loader.instance(); Bootstrap.register(); - Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() {{ + Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() + {{ modId = "test"; }})); } @@ -46,7 +48,7 @@ public class DummyBlockReplacementTest PersistentRegistryManager.freezeData(); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); - final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Block.class); + final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Block.class); Block fnd = blockRegistry.getValue(myDirt); assertNotEquals("Didn't find my block", fnd, testDirtBlock); diff --git a/src/test/java/net/minecraftforge/fml/common/registry/ForgeTestRunner.java b/src/test/java/net/minecraftforge/fml/common/registry/ForgeTestRunner.java index 8302867abb..ad5dc798c6 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/ForgeTestRunner.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/ForgeTestRunner.java @@ -1,9 +1,5 @@ package net.minecraftforge.fml.common.registry; -import java.net.URLClassLoader; -import java.util.Collections; -import java.util.Set; - import com.google.common.collect.Sets; import org.junit.runner.Description; import org.junit.runner.Runner; @@ -12,6 +8,10 @@ import org.junit.runner.notification.RunNotifier; import org.junit.runners.JUnit4; import org.junit.runners.model.InitializationError; +import java.net.URLClassLoader; +import java.util.Collections; +import java.util.Set; + /** * Uses {@code ResettingClassLoader} to load the test class. Minecraft and Forge * classes are loaded using the separate class loader. @@ -41,7 +41,7 @@ public class ForgeTestRunner extends Runner String testFileClassName = testFileClass.getName(); String delegateRunningToClassName = delegateRunningTo.getName(); - String[] allPatterns = new String[] {testFileClassName, delegateRunningToClassName}; + String[] allPatterns = new String[]{testFileClassName, delegateRunningToClassName}; ResettingClassLoader classLoader = new ResettingClassLoader(allPatterns); @@ -51,7 +51,7 @@ public class ForgeTestRunner extends Runner Class testClass = classLoader.loadClass(testFileClassName); innerRunner = innerRunnerClass.cast(innerRunnerClass.getConstructor(Class.class).newInstance(testClass)); } - catch (Exception e) + catch (Exception e) { throw new InitializationError(e); } @@ -87,14 +87,12 @@ public class ForgeTestRunner extends Runner /** * If a class name starts with any of the supplied patterns, it is loaded by * this classloader; otherwise it is loaded by the parent classloader. - * */ private class ResettingClassLoader extends URLClassLoader { private final Set quarantinedClassNames; /** - * * @param quarantinedClassNames prefixes to match against when deciding how to load a class */ public ResettingClassLoader(String... quarantinedClassNames) @@ -103,7 +101,7 @@ public class ForgeTestRunner extends Runner this.quarantinedClassNames = Sets.newHashSet(); Collections.addAll(this.quarantinedClassNames, quarantinedClassNames); - Collections.addAll(this.quarantinedClassNames, "net.minecraft", "net.minecraftforge"); + Collections.addAll(this.quarantinedClassNames, "net.minecraft", "net.minecraftforge"); } @@ -118,16 +116,16 @@ public class ForgeTestRunner extends Runner { boolean quarantine = false; - for(String quarantinedPattern : quarantinedClassNames) + for (String quarantinedPattern : quarantinedClassNames) { - if(name.startsWith(quarantinedPattern)) + if (name.startsWith(quarantinedPattern)) { quarantine = true; break; } } - if(quarantine) + if (quarantine) { try { diff --git a/src/test/java/net/minecraftforge/fml/common/registry/FreezingTests.java b/src/test/java/net/minecraftforge/fml/common/registry/FreezingTests.java index 05b0a4dfd4..3628bd93a1 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/FreezingTests.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/FreezingTests.java @@ -8,7 +8,8 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; /** * Created by cpw on 04/07/16. @@ -25,8 +26,10 @@ public class FreezingTests private static RTest r6; private static PersistentRegistryManager.GameDataSnapshot ss; - static class RTest extends IForgeRegistryEntry.Impl { - public RTest(String name) { + static class RTest extends IForgeRegistryEntry.Impl + { + public RTest(String name) + { setRegistryName(name); } } @@ -70,7 +73,7 @@ public class FreezingTests PersistentRegistryManager.findRegistryByType(RTest.class).register(r5); PersistentRegistryManager.findRegistryByType(RTest.class).register(r4); PersistentRegistryManager.findRegistryByType(RTest.class).register(r3); - FMLControlledNamespacedRegistry r = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistry(r3); + FMLControlledNamespacedRegistry r = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistry(r3); int r3id = r.getId(r3); PersistentRegistryManager.freezeData(); RTest q1 = PersistentRegistryManager.PersistentRegistry.FROZEN.getRegistry(RTest.class).getValue(new ResourceLocation("test3")); diff --git a/src/test/java/net/minecraftforge/fml/common/registry/ItemBlockSubstitutionRemoveRestoreTest.java b/src/test/java/net/minecraftforge/fml/common/registry/ItemBlockSubstitutionRemoveRestoreTest.java index 52970990e8..7ab4438593 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/ItemBlockSubstitutionRemoveRestoreTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/ItemBlockSubstitutionRemoveRestoreTest.java @@ -27,9 +27,11 @@ import static org.junit.Assert.assertNotEquals; public class ItemBlockSubstitutionRemoveRestoreTest { private ResourceLocation myDirt = new ResourceLocation("minecraft:dirt"); + private static class ItemMyDirt extends ItemMultiTexture { - public ItemMyDirt() { + public ItemMyDirt() + { super(Blocks.DIRT, Blocks.DIRT, new Mapper() { @Nonnull @@ -40,15 +42,18 @@ public class ItemBlockSubstitutionRemoveRestoreTest }); } } + private static ItemMyDirt myDirtInstance; private static Item originalDirt; + @BeforeClass public static void setup() { Loader.instance(); Bootstrap.register(); myDirtInstance = new ItemMyDirt(); - Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() {{ + Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() + {{ modId = "test"; }})); originalDirt = new ItemStack(Blocks.DIRT).getItem(); @@ -61,10 +66,10 @@ public class ItemBlockSubstitutionRemoveRestoreTest PersistentRegistryManager.freezeData(); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); - final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Item.class); + final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Item.class); // TEST 1: Does my substitute take effect? The substitute should be found in the registry - ItemBlock dirtitem = (ItemBlock)itemRegistry.getValue(myDirt); + 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 @@ -73,14 +78,14 @@ public class ItemBlockSubstitutionRemoveRestoreTest PersistentRegistryManager.injectSnapshot(snapshot, false, false); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); - dirtitem = (ItemBlock)itemRegistry.getValue(myDirt); + 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(); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); - dirtitem = (ItemBlock)itemRegistry.getValue(myDirt); + dirtitem = (ItemBlock) itemRegistry.getValue(myDirt); assertEquals("ItemBlock points at my block", myDirtInstance, dirtitem); } } diff --git a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java index 92401adc43..322aac2d35 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionInjectionTest.java @@ -18,7 +18,6 @@ import org.junit.runner.RunWith; import javax.annotation.Nonnull; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.fail; /** @@ -28,7 +27,8 @@ import static org.junit.Assert.fail; public class SubstitutionInjectionTest { private ResourceLocation myDirt = new ResourceLocation("minecraft:dirt"); - private BlockDirt toSub = new BlockDirt() { + private BlockDirt toSub = new BlockDirt() + { @Override @Nonnull public String toString() @@ -42,7 +42,8 @@ public class SubstitutionInjectionTest { Loader.instance(); Bootstrap.register(); - Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() {{ + Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() + {{ modId = "test"; }})); } @@ -50,8 +51,8 @@ public class SubstitutionInjectionTest @Test public void testSubstitutionInjection() throws Exception { - final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Block.class); - final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Item.class); + final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Block.class); + final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Item.class); // Capture snapshot prior to registering the substitution - this is a world state "pre-substitute" final PersistentRegistryManager.GameDataSnapshot snapshot = PersistentRegistryManager.takeSnapshot(); @@ -62,7 +63,7 @@ public class SubstitutionInjectionTest 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(myDirt); assertEquals("ItemBlock points at my block", currDirt, dirtitem.block); GameRegistry.addSubstitutionAlias("minecraft:dirt", GameRegistry.Type.BLOCK, toSub); @@ -72,7 +73,8 @@ public class SubstitutionInjectionTest try { StatList.reinit(); - } catch (Exception e) + } + catch (Exception e) { fail("Caught exception"); } @@ -85,7 +87,7 @@ public class SubstitutionInjectionTest assertEquals("Got my dirt substitute - registry", toSub, fnd); // TEST 1a: Validate that the ItemBlock for Dirt now points at my dirt - dirtitem = (ItemBlock)itemRegistry.getValue(myDirt); + dirtitem = (ItemBlock) itemRegistry.getValue(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); // TEST 2: Does the substitute get injected when told by loading operation? The substitute should be found in the registry @@ -97,7 +99,7 @@ public class SubstitutionInjectionTest 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(myDirt); assertEquals("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 @@ -108,7 +110,7 @@ public class SubstitutionInjectionTest 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(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); // TEST 2 repeat: Does the substitute get injected when told by loading operation? The substitute should be found in the registry @@ -120,7 +122,7 @@ public class SubstitutionInjectionTest 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(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); // TEST 3 repeat: Does the substitute get restored when reverting to frozen state? The substitute should be found in the registry again @@ -131,7 +133,7 @@ public class SubstitutionInjectionTest 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(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); } diff --git a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionRemoveRestoreTest.java b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionRemoveRestoreTest.java index 97766005c7..efd76218f9 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionRemoveRestoreTest.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/SubstitutionRemoveRestoreTest.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertNotEquals; public class SubstitutionRemoveRestoreTest { private ResourceLocation myDirt = new ResourceLocation("minecraft:dirt"); - private BlockDirt toSub = new BlockDirt() { + private BlockDirt toSub = new BlockDirt() + { }; @@ -33,7 +34,8 @@ public class SubstitutionRemoveRestoreTest { Loader.instance(); Bootstrap.register(); - Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() {{ + Loader.instance().setupTestHarness(new DummyModContainer(new ModMetadata() + {{ modId = "test"; }})); } @@ -45,8 +47,8 @@ public class SubstitutionRemoveRestoreTest PersistentRegistryManager.freezeData(); ObjectHolderRegistry.INSTANCE.applyObjectHolders(); - final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Block.class); - final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry)PersistentRegistryManager.findRegistryByType(Item.class); + final FMLControlledNamespacedRegistry blockRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Block.class); + final FMLControlledNamespacedRegistry itemRegistry = (FMLControlledNamespacedRegistry) PersistentRegistryManager.findRegistryByType(Item.class); // TEST 1: Does my substitute take effect? The substitute should be found in the registry Block fnd = blockRegistry.getValue(myDirt); @@ -55,7 +57,7 @@ public class SubstitutionRemoveRestoreTest assertEquals("Got my dirt substitute - Blocks and registry", currDirt, fnd); assertEquals("Got my dirt substitute - registry", toSub, fnd); - ItemBlock dirtitem = (ItemBlock)itemRegistry.getValue(myDirt); + ItemBlock dirtitem = (ItemBlock) itemRegistry.getValue(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); // TEST 2: Does the substitute get removed when told by remote operation? The substitute should NOT be found in the registry @@ -69,7 +71,7 @@ public class SubstitutionRemoveRestoreTest 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(myDirt); assertEquals("ItemBlock points at vanilla block", currDirt, dirtitem.block); assertNotEquals("ItemBlock points at my block", toSub, dirtitem.block); @@ -82,7 +84,7 @@ public class SubstitutionRemoveRestoreTest 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(myDirt); assertEquals("ItemBlock points at my block", toSub, dirtitem.block); } } diff --git a/src/test/java/net/minecraftforge/fml/common/registry/VanillaRegistryTests.java b/src/test/java/net/minecraftforge/fml/common/registry/VanillaRegistryTests.java index 696730a593..33b93fda74 100644 --- a/src/test/java/net/minecraftforge/fml/common/registry/VanillaRegistryTests.java +++ b/src/test/java/net/minecraftforge/fml/common/registry/VanillaRegistryTests.java @@ -31,10 +31,10 @@ public class VanillaRegistryTests public void testSetup() { // All the blocks loaded - assertEquals("We have all the blocks via GameData",236,Block.REGISTRY.getKeys().size()); + assertEquals("We have all the blocks via GameData", 236, Block.REGISTRY.getKeys().size()); // All the items loaded - assertEquals("We have all the items via GameData",392,Item.REGISTRY.getKeys().size()); + assertEquals("We have all the items via GameData", 392, Item.REGISTRY.getKeys().size()); // Our lookups find the same stuff vanilla sees final IForgeRegistry blocks = PersistentRegistryManager.findRegistry(Blocks.AIR); @@ -64,7 +64,9 @@ public class VanillaRegistryTests @Test public void testRegistration() { - Block myBlock = GameRegistry.register(new Block(Material.CAKE) {}, new ResourceLocation("minecraft:testy")); + Block myBlock = GameRegistry.register(new Block(Material.CAKE) + { + }, new ResourceLocation("minecraft:testy")); assertNotNull("Registered my block", myBlock); // Our lookups find the same stuff vanilla sees diff --git a/src/test/java/net/minecraftforge/fml/debug/FaultyCoreMod.java b/src/test/java/net/minecraftforge/fml/debug/FaultyCoreMod.java index f42d7ed681..a201c22c29 100644 --- a/src/test/java/net/minecraftforge/fml/debug/FaultyCoreMod.java +++ b/src/test/java/net/minecraftforge/fml/debug/FaultyCoreMod.java @@ -1,28 +1,53 @@ package net.minecraftforge.fml.debug; -import java.util.Map; - import net.minecraft.launchwrapper.IClassTransformer; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -public class FaultyCoreMod implements IFMLLoadingPlugin { +import java.util.Map; + +public class FaultyCoreMod implements IFMLLoadingPlugin +{ public static boolean enabled = false; + @Override public String[] getASMTransformerClass() { - return new String[] { FaultyTransformer.class.getName() }; + return new String[]{FaultyTransformer.class.getName()}; } - public String getModContainerClass() { return null; } - public String getSetupClass() { return null; } - public void injectData(Map data) {} - public String getAccessTransformerClass() { return null; } + @Override + public String getModContainerClass() + { + return null; + } - public static class FaultyTransformer implements IClassTransformer { + @Override + public String getSetupClass() + { + return null; + } + @Override + public void injectData(Map data) + { + } + + @Override + public String getAccessTransformerClass() + { + return null; + } + + public static class FaultyTransformer implements IClassTransformer + { + + @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { - if(enabled && name.equals("net.minecraft.client.gui.GuiMainMenu")) throw new RuntimeException("Faulty transformer test exception"); + if (enabled && name.equals("net.minecraft.client.gui.GuiMainMenu")) + { + throw new RuntimeException("Faulty transformer test exception"); + } return basicClass; } } diff --git a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java index 1ad3e29c4b..0a4b9ac170 100644 --- a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java +++ b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java @@ -1,4 +1,5 @@ package net.minecraftforge.fml.test; + import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.PacketBuffer; @@ -13,16 +14,17 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import net.minecraftforge.fml.relauncher.Side; -@Mod(modid = ForgeNetworkTestMod.MOD_ID, name = ForgeNetworkTestMod.MOD_ID, acceptableRemoteVersions = "*") +@Mod(modid = ForgeNetworkTestMod.MOD_ID, name = ForgeNetworkTestMod.MOD_ID, version = "1.0", acceptableRemoteVersions = "*") public class ForgeNetworkTestMod { + private static final boolean ENABLED = false; public static final String MOD_ID = "forgenetworktest"; private FMLEventChannel channel; @EventHandler public void onPreInit(FMLPreInitializationEvent e) { - if (e.getSide() == Side.SERVER) + if (ENABLED && e.getSide() == Side.SERVER) { MinecraftForge.EVENT_BUS.register(this); channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(MOD_ID); @@ -34,9 +36,11 @@ public class ForgeNetworkTestMod public void onPlayerLogin(PlayerLoggedInEvent e) { if (channel == null) + { return; + } PacketBuffer buffer = new PacketBuffer(Unpooled.buffer()); buffer.writeByte(0); - channel.sendTo(new FMLProxyPacket(buffer, MOD_ID), (EntityPlayerMP)e.player); // disconnects vanilla clients in 1.11 + channel.sendTo(new FMLProxyPacket(buffer, MOD_ID), (EntityPlayerMP) e.player); // disconnects vanilla clients in 1.11 } } diff --git a/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java b/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java index 2c52b01f27..87edb09a2a 100644 --- a/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java +++ b/src/test/java/net/minecraftforge/fml/test/TestNetStuff.java @@ -1,15 +1,16 @@ package net.minecraftforge.fml.test; -import static org.junit.Assert.*; +import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraftforge.fml.common.network.ByteBufUtils; - import org.junit.Test; -import com.google.common.base.Strings; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; -public class TestNetStuff { +public class TestNetStuff +{ @Test public void testByteBufUtilsByteCount() @@ -33,39 +34,39 @@ public class TestNetStuff { { ByteBuf buf = Unpooled.buffer(5, 5); ByteBufUtils.writeVarInt(buf, 1, 1); - assertArrayEquals("1 as byte[] is [1]", new byte[] { 1, 0, 0, 0, 0 }, buf.array()); + assertArrayEquals("1 as byte[] is [1]", new byte[]{1, 0, 0, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 127, 1); - assertArrayEquals("127 as byte[] is [127]", new byte[] { 127, 0, 0, 0, 0 }, buf.array()); + assertArrayEquals("127 as byte[] is [127]", new byte[]{127, 0, 0, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 128, 2); - assertArrayEquals("128 as byte[] is [-128, 1]", new byte[] { -128, 1, 0, 0, 0 }, buf.array()); + assertArrayEquals("128 as byte[] is [-128, 1]", new byte[]{-128, 1, 0, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 16383, 2); - assertArrayEquals("16383 as byte[] is [-1, 127]", new byte[] { -1, 127, 0, 0, 0 }, buf.array()); + assertArrayEquals("16383 as byte[] is [-1, 127]", new byte[]{-1, 127, 0, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 16384, 3); - assertArrayEquals("16384 as byte[] is [-1, -128, 1]", new byte[] { -128, -128, 1, 0, 0 }, buf.array()); + assertArrayEquals("16384 as byte[] is [-1, -128, 1]", new byte[]{-128, -128, 1, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 2097151, 3); - assertArrayEquals("2097151 as byte[] is [-1, -1, 127]", new byte[] { -1, -1, 127, 0, 0 }, buf.array()); + assertArrayEquals("2097151 as byte[] is [-1, -1, 127]", new byte[]{-1, -1, 127, 0, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 2097152, 4); - assertArrayEquals("16384 as byte[] is [-128, -128, 1]", new byte[] { -128, -128, -128, 1, 0 }, buf.array()); + assertArrayEquals("16384 as byte[] is [-128, -128, 1]", new byte[]{-128, -128, -128, 1, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 268435455, 4); - assertArrayEquals("268435455 as byte[] is [-1, -1, -1, 127]", new byte[] { -1, -1, -1, 127, 0 }, buf.array()); + assertArrayEquals("268435455 as byte[] is [-1, -1, -1, 127]", new byte[]{-1, -1, -1, 127, 0}, buf.array()); buf.clear(); ByteBufUtils.writeVarInt(buf, 268435456, 5); - assertArrayEquals("268435456 as byte[] is [-1, -128, 1]", new byte[] { -128, -128, -128, -128, 1 }, buf.array()); + assertArrayEquals("268435456 as byte[] is [-1, -128, 1]", new byte[]{-128, -128, -128, -128, 1}, buf.array()); } @Test @@ -111,24 +112,24 @@ public class TestNetStuff { @Test public void testByteBufUtilsStrings() { - String test = new String("test"); + String test = "test"; ByteBuf buf = Unpooled.buffer(20, 20); ByteBufUtils.writeUTF8String(buf, test); - assertArrayEquals("String bytes", new byte[] { 4, 116, 101, 115, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, buf.array()); + assertArrayEquals("String bytes", new byte[]{4, 116, 101, 115, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, buf.array()); String repeat = Strings.repeat("test", 100); buf = Unpooled.buffer(420, 420); ByteBufUtils.writeUTF8String(buf, repeat); - assertArrayEquals("String repeat bytes", new byte[] {-112, 3, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, buf.array()); + assertArrayEquals("String repeat bytes", new byte[]{-112, 3, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 116, 101, 115, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, buf.array()); } @Test public void testVarShort() { - ByteBuf buf = Unpooled.buffer(3,3); + ByteBuf buf = Unpooled.buffer(3, 3); ByteBufUtils.writeVarShort(buf, 32766); - assertArrayEquals("Two byte short written", new byte[] { 127, -2, 0}, buf.array()); + assertArrayEquals("Two byte short written", new byte[]{127, -2, 0}, buf.array()); assertEquals("Two byte short written", 2, buf.readableBytes()); buf.clear(); @@ -136,7 +137,7 @@ public class TestNetStuff { buf.clear(); buf.writeShort(32766); - assertArrayEquals("Two byte short written", new byte[] { 127, -2, 0}, buf.array()); + assertArrayEquals("Two byte short written", new byte[]{127, -2, 0}, buf.array()); int val = ByteBufUtils.readVarShort(buf); assertEquals("Two byte short read correctly", 32766, val); @@ -146,7 +147,7 @@ public class TestNetStuff { buf.clear(); ByteBufUtils.writeVarShort(buf, 32768); - assertArrayEquals("Three byte short written", new byte[] { -128, 0, 1}, buf.array()); + assertArrayEquals("Three byte short written", new byte[]{-128, 0, 1}, buf.array()); assertEquals("Three byte short written", 3, buf.readableBytes()); buf.clear(); @@ -162,7 +163,7 @@ public class TestNetStuff { buf.clear(); ByteBufUtils.writeVarShort(buf, 8388607); - assertArrayEquals("Three byte short written", new byte[] { -1, -1, -1}, buf.array()); + assertArrayEquals("Three byte short written", new byte[]{-1, -1, -1}, buf.array()); assertEquals("Three byte short written", 3, buf.readableBytes()); buf.clear(); diff --git a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java index 1251531c60..2833c2679c 100644 --- a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java +++ b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage1.java @@ -1,9 +1,10 @@ package net.minecraftforge.fml.test.simplenet; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -public class SimpleNetTestMessage1 implements IMessage { +public class SimpleNetTestMessage1 implements IMessage +{ @Override public void fromBytes(ByteBuf buf) { diff --git a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java index 6814cc54c5..29eec8a2a9 100644 --- a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java +++ b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTestMessage2.java @@ -1,9 +1,10 @@ package net.minecraftforge.fml.test.simplenet; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import io.netty.buffer.ByteBuf; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -public class SimpleNetTestMessage2 implements IMessage { +public class SimpleNetTestMessage2 implements IMessage +{ @Override public void fromBytes(ByteBuf buf) diff --git a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java index 4d6d65c7e1..bbec813dbf 100644 --- a/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java +++ b/src/test/java/net/minecraftforge/fml/test/simplenet/SimpleNetTester.java @@ -1,13 +1,14 @@ package net.minecraftforge.fml.test.simplenet; -import static org.junit.Assert.*; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; - import org.junit.Test; -public class SimpleNetTester { +import static org.junit.Assert.assertTrue; + +public class SimpleNetTester +{ @Test public void test() diff --git a/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java b/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java index 3f44ea244d..9f6d7063cf 100644 --- a/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java +++ b/src/test/java/net/minecraftforge/test/BiomeSpawnableListTest.java @@ -31,7 +31,7 @@ public class BiomeSpawnableListTest } private boolean spawnableListContainsEntry(Class entityClass, int weightedProb, int minGroupCount, int maxGroupCount, - EnumCreatureType creatureType, Biome biome) + EnumCreatureType creatureType, Biome biome) { boolean found = false; diff --git a/src/test/java/net/minecraftforge/test/EntityTravelToDimensionEventTest.java b/src/test/java/net/minecraftforge/test/EntityTravelToDimensionEventTest.java deleted file mode 100644 index f95c10edf7..0000000000 --- a/src/test/java/net/minecraftforge/test/EntityTravelToDimensionEventTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.minecraftforge.test; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityTravelToDimensionEvent; -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.eventhandler.SubscribeEvent; - -@Mod(modid="entitytraveltodimensioneventtest", name="EntityTravelToDimensionEventTest", version="0.0.0", acceptableRemoteVersions = "*") -public class EntityTravelToDimensionEventTest -{ - public static final boolean ENABLE = false; - - @EventHandler - public void init(FMLInitializationEvent event) - { - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onDimensionTravel(EntityTravelToDimensionEvent event) - { - if(ENABLE) { - System.out.println("Travelling to Dimension " + event.getDimension()); - event.setCanceled(true); - } - } -} diff --git a/src/test/java/net/minecraftforge/test/EnumHelperTest.java b/src/test/java/net/minecraftforge/test/EnumHelperTest.java index e37fe4e843..b0dc459837 100644 --- a/src/test/java/net/minecraftforge/test/EnumHelperTest.java +++ b/src/test/java/net/minecraftforge/test/EnumHelperTest.java @@ -1,5 +1,15 @@ package net.minecraftforge.test; +import com.google.common.base.Joiner; +import com.google.common.base.Throwables; +import net.minecraft.enchantment.EnumEnchantmentType; +import net.minecraft.init.Bootstrap; +import net.minecraftforge.client.EnumHelperClient; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.util.EnumHelper; +import org.junit.Assert; +import org.junit.Test; + import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -10,18 +20,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.minecraft.enchantment.EnumEnchantmentType; -import net.minecraft.init.Bootstrap; -import net.minecraftforge.client.EnumHelperClient; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.util.EnumHelper; - -import org.junit.Assert; -import org.junit.Test; - -import com.google.common.base.Joiner; -import com.google.common.base.Throwables; - public class EnumHelperTest { private static final Joiner COMMA = Joiner.on(","); @@ -79,8 +77,8 @@ public class EnumHelperTest actualParameters = Arrays.copyOfRange(actualParameters, 1, actualParameters.length); //Trim off name String info = " Method: " + method.getDeclaringClass().getSimpleName() + "." + method.getName() + "\n" + - " Class: " + returnType.getName() + "\n" + - " Actual: " + COMMA.join(actualParameters); + " Class: " + returnType.getName() + "\n" + + " Actual: " + COMMA.join(actualParameters); boolean found = false; // There can sometimes be multiple constructors. @@ -89,10 +87,14 @@ public class EnumHelperTest boolean filter = declaredConstructor.isSynthetic(); if (returnType == EnumEnchantmentType.class && declaredConstructor.getParameterTypes().length == 2) - filter = true; //We don't want people using this method. + { + filter = true; //We don't want people using this method. + } if (!filter) + { seenCtrs.add(declaredConstructor); + } //System.out.println(" " + declaredConstructor.toString()); Class[] expectedParameters = declaredConstructor.getParameterTypes(); @@ -109,7 +111,7 @@ public class EnumHelperTest info += "\n Expected: " + COMMA.join(expectedParameters); - if (Arrays.equals(actualParameters, expectedParameters)) + if (Arrays.equals(actualParameters, expectedParameters)) { matchedCtrs.add(declaredConstructor); found = true; @@ -118,7 +120,7 @@ public class EnumHelperTest if (!found) { - System.out.println("Pamaters did not Match:"); + System.out.println("Parameters did not Match:"); System.out.println(info); failed = true; } diff --git a/src/test/java/net/minecraftforge/test/NeighborNotifyEventTest.java b/src/test/java/net/minecraftforge/test/NeighborNotifyEventTest.java deleted file mode 100644 index a5ade79760..0000000000 --- a/src/test/java/net/minecraftforge/test/NeighborNotifyEventTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.minecraftforge.test; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent; -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.eventhandler.SubscribeEvent; - -@Mod(modid="neighbornotifyeventtest", name="NeighborNotifyEventTest", version="0.0.0", acceptableRemoteVersions = "*") -public class NeighborNotifyEventTest -{ - - public static final boolean ENABLE = false; - - @EventHandler - public void init(FMLInitializationEvent event) - { - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onNeighborNotify(NeighborNotifyEvent event) - { - if(ENABLE) { - System.out.println(event.getPos().toString() + " with face information: " + event.getNotifiedSides()); - event.setCanceled(true); - } - } -} diff --git a/src/test/java/net/minecraftforge/test/PlayerSetSpawnTest.java b/src/test/java/net/minecraftforge/test/PlayerSetSpawnTest.java deleted file mode 100644 index 93a54d97d8..0000000000 --- a/src/test/java/net/minecraftforge/test/PlayerSetSpawnTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.minecraftforge.test; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerSetSpawnEvent; -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.eventhandler.SubscribeEvent; - -@Mod(modid="playersetspawntest", name="Player Set Spawn Test", version="0.0.0", acceptableRemoteVersions = "*") -public class PlayerSetSpawnTest { - - @EventHandler - public void init(FMLInitializationEvent event) - { - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent - public void onPlayerSetSpawn(PlayerSetSpawnEvent event) - { - System.out.println(event.isForced() + " " + event.getNewSpawn().toString()); - event.setCanceled(true); - } -}