diff --git a/src/test/java/net/minecraftforge/debug/AdvancementsPaginationTest.java b/src/test/java/net/minecraftforge/debug/AdvancementsPaginationTest.java deleted file mode 100644 index 6fc7e866a0..0000000000 --- a/src/test/java/net/minecraftforge/debug/AdvancementsPaginationTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.minecraftforge.debug; - -import net.minecraftforge.fml.common.Mod; - -@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*") -public class AdvancementsPaginationTest -{ -} diff --git a/src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java b/src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java deleted file mode 100644 index a0487f410e..0000000000 --- a/src/test/java/net/minecraftforge/debug/AnimalTameEventTest.java +++ /dev/null @@ -1,28 +0,0 @@ -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", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber -public class AnimalTameEventTest -{ - static final String MOD_ID = "animal_tame_event_test"; - static final boolean ENABLED = false; - - @SubscribeEvent - public static void onAnimalTame(AnimalTameEvent event) - { - if (!ENABLED) - { - return; - } - - if (event.getAnimal() instanceof EntityWolf) - { - event.setCanceled(true); - } - } -} diff --git a/src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java b/src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java deleted file mode 100644 index 9f832f4605..0000000000 --- a/src/test/java/net/minecraftforge/debug/BlockPlaceEventTest.java +++ /dev/null @@ -1,29 +0,0 @@ -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", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber -public class BlockPlaceEventTest -{ - static final String MOD_ID = "block_place_event_test"; - static final boolean ENABLED = false; - - @SubscribeEvent - public static void onBlockPlaced(BlockEvent.PlaceEvent event) - { - if (!ENABLED) - { - return; - } - - if (event.getPlacedBlock().getBlock() == Blocks.CHEST - && event.getPlacedAgainst().getBlock() != Blocks.DIAMOND_BLOCK) - { - event.setCanceled(true); - } - } -} diff --git a/src/test/java/net/minecraftforge/debug/BreedingTest.java b/src/test/java/net/minecraftforge/debug/BreedingTest.java deleted file mode 100644 index 2acf48332c..0000000000 --- a/src/test/java/net/minecraftforge/debug/BreedingTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.minecraftforge.debug; - -import net.minecraft.entity.passive.EntityCow; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -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"; - static final boolean ENABLED = false; - - @Mod.EventHandler - public void preInit(FMLPreInitializationEvent event) - { - if (ENABLED) - { - MinecraftForge.EVENT_BUS.register(this); - } - } - - @SubscribeEvent - public void onBabyBorn(BabyEntitySpawnEvent event) - { - event.setChild(new EntityCow(event.getParentA().world)); - } -} diff --git a/src/test/java/net/minecraftforge/debug/CheckSpawnTest.java b/src/test/java/net/minecraftforge/debug/CheckSpawnTest.java deleted file mode 100644 index fd5cec704d..0000000000 --- a/src/test/java/net/minecraftforge/debug/CheckSpawnTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.minecraftforge.debug; - -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; -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.Event.Result; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; - -@Mod(modid = CheckSpawnTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*") -public class CheckSpawnTest -{ - public static final String MODID = "checkspawntest"; - public static final boolean ENABLED = false; - - @EventHandler - public void onPreInit(FMLPreInitializationEvent event) - { - if (ENABLED) - { - MinecraftForge.EVENT_BUS.register(this); - } - } - - @SubscribeEvent - public void canMobSpawn(CheckSpawn event) - { - event.setResult(Result.DENY); - } -} diff --git a/src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java b/src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java deleted file mode 100644 index 6b55ffcfae..0000000000 --- a/src/test/java/net/minecraftforge/debug/CustomSpawnDimensionTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.minecraftforge.debug; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.MinecraftForge; -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", acceptableRemoteVersions = "*") -public class CustomSpawnDimensionTest -{ - public static final String MODID = "customspawndimensiontest"; - - private static final boolean ENABLE = false; - - public CustomSpawnDimensionTest() - { - if (ENABLE) - { - MinecraftForge.EVENT_BUS.register(this); - } - } - - @SubscribeEvent - public void enterDimension(EntityJoinWorldEvent event) - { - Entity e = event.getEntity(); - if (!(e instanceof EntityPlayer)) - { - return; - } - - BlockPos pos = e.getPosition(); - int dim = e.dimension; - - ((EntityPlayer) e).setSpawnDimension(dim); - ((EntityPlayer) e).setSpawnChunk(pos, true, dim); - } -} diff --git a/src/test/java/net/minecraftforge/debug/TooltipColorTest.java b/src/test/java/net/minecraftforge/debug/TooltipColorTest.java deleted file mode 100644 index 92e4440fb8..0000000000 --- a/src/test/java/net/minecraftforge/debug/TooltipColorTest.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.minecraftforge.debug; - -import net.minecraft.init.Items; -import net.minecraftforge.client.event.RenderTooltipEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@Mod(modid = TooltipColorTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true) -public class TooltipColorTest -{ - public static final String MODID = "tooltipcolortest"; - - private static final boolean ENABLE = false; - - public TooltipColorTest() - { - if (ENABLE) - { - MinecraftForge.EVENT_BUS.register(this); - } - } - - @SubscribeEvent - @SideOnly(Side.CLIENT) - public void getTooltipColor(RenderTooltipEvent.Color event) - { - if (event.getStack().getItem() == Items.APPLE) - { - event.setBackground(0xF0510404); - event.setBorderStart(0xF0bc0909); - event.setBorderEnd(0xF03f0f0f); - } - } -} \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java similarity index 83% rename from src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java rename to src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java index be2b67c867..f28e191f1a 100644 --- a/src/test/java/net/minecraftforge/debug/FogColorInsideMaterialTest.java +++ b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -30,8 +49,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; @EventBusSubscriber -@Mod(modid = FogColorInsideMaterialTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") -public class FogColorInsideMaterialTest +@Mod(modid = MaterialFogColorTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") +public class MaterialFogColorTest { static final boolean ENABLED = false; // <-- enable mod static int color = 0xFFd742f4; // <-- change value for testing diff --git a/src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java similarity index 58% rename from src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java rename to src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java index 923b945046..c465d87e65 100644 --- a/src/test/java/net/minecraftforge/debug/NeighborNotifyEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent; diff --git a/src/test/java/net/minecraftforge/debug/BlockParticleEffectsTest.java b/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java similarity index 83% rename from src/test/java/net/minecraftforge/debug/BlockParticleEffectsTest.java rename to src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java index f2cf74c8ea..4715ddcf45 100644 --- a/src/test/java/net/minecraftforge/debug/BlockParticleEffectsTest.java +++ b/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -28,12 +47,12 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import static net.minecraftforge.debug.BlockParticleEffectsTest.MOD_ID; -import static net.minecraftforge.debug.BlockParticleEffectsTest.MOD_NAME; +import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_ID; +import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_NAME; @EventBusSubscriber @Mod (modid = MOD_ID, name = MOD_NAME, version = "1.0", acceptableRemoteVersions = "*") -public class BlockParticleEffectsTest +public class ParticleEffectsTest { public static final String MOD_ID = "blockparticleeffectstest"; diff --git a/src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java similarity index 67% rename from src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java rename to src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java index e13a0e07a0..baeb3fa897 100644 --- a/src/test/java/net/minecraftforge/debug/BlockAiNodeTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -17,9 +36,9 @@ import net.minecraftforge.fml.relauncher.Side; import java.util.Collections; -@Mod(modid = BlockAiNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") +@Mod(modid = PathNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber -public class BlockAiNodeTypeTest +public class PathNodeTypeTest { static final String MOD_ID = "ai_node_type_test"; static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java b/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java new file mode 100644 index 0000000000..dfe3de18e6 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java @@ -0,0 +1,48 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; + +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 = PlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") +@Mod.EventBusSubscriber +public class PlaceEventTest +{ + static final String MOD_ID = "block_place_event_test"; + static final boolean ENABLED = false; + + @SubscribeEvent + public static void onBlockPlaced(BlockEvent.PlaceEvent event) + { + if (!ENABLED) + { + return; + } + + if (event.getPlacedBlock().getBlock() == Blocks.CHEST + && event.getPlacedAgainst().getBlock() != Blocks.DIAMOND_BLOCK) + { + event.setCanceled(true); + } + } +} diff --git a/src/test/java/net/minecraftforge/debug/SlipperinessTest.java b/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/SlipperinessTest.java rename to src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java index 32402a2119..993af08d41 100644 --- a/src/test/java/net/minecraftforge/debug/SlipperinessTest.java +++ b/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/test/java/net/minecraftforge/debug/CustomSlimeBlockTest.java b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java similarity index 82% rename from src/test/java/net/minecraftforge/debug/CustomSlimeBlockTest.java rename to src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java index 52981ca9f9..d3916787e8 100644 --- a/src/test/java/net/minecraftforge/debug/CustomSlimeBlockTest.java +++ b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.block; import net.minecraft.block.Block; import net.minecraft.block.BlockSlime; @@ -24,8 +43,8 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Mod(modid = CustomSlimeBlockTest.MODID, name = "ForgeDebugCustomSlimeBlock", version = CustomSlimeBlockTest.VERSION, acceptableRemoteVersions = "*") -public class CustomSlimeBlockTest +@Mod(modid = StickyBlockTest.MODID, name = "ForgeDebugCustomSlimeBlock", version = StickyBlockTest.VERSION, acceptableRemoteVersions = "*") +public class StickyBlockTest { public static final String MODID = "forgedebugcustomslimeblock"; public static final String ASSETS = "forgedebugcustomslimeblock:"; diff --git a/src/test/java/net/minecraftforge/debug/block/package-info.java b/src/test/java/net/minecraftforge/debug/block/package-info.java new file mode 100644 index 0000000000..02f168f6f4 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/block/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.block; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/ClientChatEventTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java similarity index 56% rename from src/test/java/net/minecraftforge/debug/ClientChatEventTest.java rename to src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java index ba273e9dc3..af5847d543 100644 --- a/src/test/java/net/minecraftforge/debug/ClientChatEventTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.chat; import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/src/test/java/net/minecraftforge/debug/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/ClientCommandTest.java rename to src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java index 89a19ac5d8..11869cec8a 100644 --- a/src/test/java/net/minecraftforge/debug/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.chat; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java similarity index 83% rename from src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java rename to src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java index 4505ff3325..73ca831369 100644 --- a/src/test/java/net/minecraftforge/debug/CommandTreeBaseTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.chat; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; diff --git a/src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java similarity index 78% rename from src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java rename to src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java index 0e46e4ef49..35a8303fbc 100644 --- a/src/test/java/net/minecraftforge/debug/CustomEntitySelectorTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorFactoryTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.chat; import com.google.common.base.Predicate; import net.minecraft.command.ICommandSender; @@ -24,7 +43,7 @@ import java.util.Map; * 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 +public class EntitySelectorFactoryTest { @Mod.EventHandler diff --git a/src/test/java/net/minecraftforge/debug/chat/package-info.java b/src/test/java/net/minecraftforge/debug/chat/package-info.java new file mode 100644 index 0000000000..ae7acd0679 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/chat/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.chat; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/CustomSpriteTest.java b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java similarity index 79% rename from src/test/java/net/minecraftforge/debug/CustomSpriteTest.java rename to src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java index c6fcc3f799..1da3aeabbc 100644 --- a/src/test/java/net/minecraftforge/debug/CustomSpriteTest.java +++ b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client; import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; @@ -24,8 +43,8 @@ import java.util.function.Function; /** * Test for {@link TextureStitchEvent.Pre}. */ -@Mod(modid = CustomSpriteTest.MOD_ID, name = CustomSpriteTest.NAME, version = "1.0", clientSideOnly = true) -public class CustomSpriteTest +@Mod(modid = CustomTextureAtlasSpriteTest.MOD_ID, name = CustomTextureAtlasSpriteTest.NAME, version = "1.0", clientSideOnly = true) +public class CustomTextureAtlasSpriteTest { static final String MOD_ID = "custom_sprite_test"; static final String NAME = "Custom sprite test"; diff --git a/src/test/java/net/minecraftforge/debug/FOVModifierTest.java b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java similarity index 54% rename from src/test/java/net/minecraftforge/debug/FOVModifierTest.java rename to src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java index bb3294c751..4a4e179315 100644 --- a/src/test/java/net/minecraftforge/debug/FOVModifierTest.java +++ b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client; import net.minecraft.block.material.Material; import net.minecraftforge.client.event.EntityViewRenderEvent; @@ -12,7 +31,7 @@ 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 +public class FOVModifierEventTest { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/DebugSearchTabs.java b/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java similarity index 56% rename from src/test/java/net/minecraftforge/debug/DebugSearchTabs.java rename to src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java index d1e8a661e5..bf4fddd108 100644 --- a/src/test/java/net/minecraftforge/debug/DebugSearchTabs.java +++ b/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; @@ -9,8 +28,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Mod(modid = DebugSearchTabs.MODID, name = "Debug Search Tab", version = "1.0", acceptableRemoteVersions = "*") -public class DebugSearchTabs +@Mod(modid = SearchableCreativeTabTest.MODID, name = "Debug Search Tab", version = "1.0", acceptableRemoteVersions = "*") +public class SearchableCreativeTabTest { public static final String MODID = "debugsearchtab"; static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/GuiContainerEventTest.java b/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java similarity index 95% rename from src/test/java/net/minecraftforge/debug/GuiContainerEventTest.java rename to src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java index ac6596311a..dbcc9ddec2 100644 --- a/src/test/java/net/minecraftforge/debug/GuiContainerEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.debug; +package net.minecraftforge.debug.client.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.inventory.Slot; @@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.Side; @EventBusSubscriber(Side.CLIENT) @Mod (modid = "guicontainereventtest", name = "GuiContainer Event Tests!", version = "1.0", acceptableRemoteVersions = "*") -public class GuiContainerEventTest +public class ContainerDrawForegroundEventTest { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java b/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java new file mode 100644 index 0000000000..55be6f2036 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java @@ -0,0 +1,56 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.gui; + +import net.minecraft.init.Items; +import net.minecraftforge.client.event.RenderTooltipEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +@Mod(modid = TooltipColorEventTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true) +public class TooltipColorEventTest +{ + public static final String MODID = "tooltipcolortest"; + + private static final boolean ENABLE = false; + + public TooltipColorEventTest() + { + if (ENABLE) + { + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void getTooltipColor(RenderTooltipEvent.Color event) + { + if (event.getStack().getItem() == Items.APPLE) + { + event.setBackground(0xF0510404); + event.setBorderStart(0xF0bc0909); + event.setBorderEnd(0xF03f0f0f); + } + } +} \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java similarity index 94% rename from src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java index 18753a2b88..20fdf3c765 100644 --- a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import com.google.common.collect.ImmutableMap; import net.minecraft.block.Block; @@ -43,7 +62,6 @@ import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; -import net.minecraftforge.debug.ItemTileDebug.TestBlock; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; @@ -64,8 +82,8 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@Mod(modid = ModelAnimationDebug.MODID, name = "ForgeDebugModelAnimation", version = ModelAnimationDebug.VERSION, acceptableRemoteVersions = "*") -public class ModelAnimationDebug +@Mod(modid = AnimatedModelTest.MODID, name = "ForgeDebugModelAnimation", version = AnimatedModelTest.VERSION, acceptableRemoteVersions = "*") +public class AnimatedModelTest { public static final String MODID = "forgedebugmodelanimation"; public static final String VERSION = "0.0"; @@ -84,7 +102,7 @@ public class ModelAnimationDebug public static final Item TEST_ROTATE_ITEM = null; @Instance(MODID) - public static ModelAnimationDebug instance; + public static AnimatedModelTest instance; @SidedProxy public static CommonProxy proxy; @@ -293,13 +311,13 @@ public class ModelAnimationDebug ClientRegistry.bindTileEntitySpecialRenderer(Spin.class, new AnimationTESR()); String entityName = MODID + ":entity_chest"; //EntityRegistry.registerGlobalEntityID(EntityChest.class, entityName, EntityRegistry.findGlobalUniqueEntityId()); - EntityRegistry.registerModEntity(new ResourceLocation(entityName), EntityChest.class, entityName, 0, ModelAnimationDebug.instance, 64, 20, true, 0xFFAAAA00, 0xFFDDDD00); + EntityRegistry.registerModEntity(new ResourceLocation(entityName), EntityChest.class, entityName, 0, AnimatedModelTest.instance, 64, 20, true, 0xFFAAAA00, 0xFFDDDD00); RenderingRegistry.registerEntityRenderingHandler(EntityChest.class, new IRenderFactory() { @SuppressWarnings("deprecation") public Render createRenderFor(RenderManager manager) { - /*model = ModelLoaderRegistry.getModel(new ResourceLocation(ModelLoaderRegistryDebug.MODID, "block/chest.b3d")); + /*model = ModelLoaderRegistry.getModel(new ResourceLocation(ModelLoaderRegistryTest.MODID, "block/chest.b3d")); if(model instanceof IRetexturableModel) { model = ((IRetexturableModel)model).retexture(ImmutableMap.of("#chest", "entity/chest/normal")); diff --git a/src/test/java/net/minecraftforge/debug/BlockstateRetextureTest.java b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java similarity index 78% rename from src/test/java/net/minecraftforge/debug/BlockstateRetextureTest.java rename to src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java index 7d761541d6..4753e6e050 100644 --- a/src/test/java/net/minecraftforge/debug/BlockstateRetextureTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import java.util.function.Function; diff --git a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java b/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java similarity index 84% rename from src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java index 434884de5e..1ae696d34f 100644 --- a/src/test/java/net/minecraftforge/debug/ForgeBlockStatesLoaderDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import com.google.common.collect.Maps; import net.minecraft.block.Block; @@ -21,9 +40,9 @@ import net.minecraftforge.fml.relauncher.Side; import java.util.Map; import java.util.Map.Entry; -@Mod(modid = ForgeBlockStatesLoaderDebug.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") +@Mod(modid = ForgeBlockStatesLoaderTest.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber -public class ForgeBlockStatesLoaderDebug +public class ForgeBlockStatesLoaderTest { public static final String MODID = "forgeblockstatesloader"; public static final String ASSETS = "forgeblockstatesloader:"; diff --git a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java similarity index 78% rename from src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java index 9448d813d3..a64451277c 100644 --- a/src/test/java/net/minecraftforge/debug/ItemLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -21,8 +40,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import javax.annotation.Nullable; import java.util.Random; -@Mod(modid = ItemLayerModelDebug.MODID, name = "ForgeDebugItemLayerModel", version = ItemLayerModelDebug.VERSION, acceptableRemoteVersions = "*") -public class ItemLayerModelDebug +@Mod(modid = ItemLayerModelTest.MODID, name = "ForgeDebugItemLayerModel", version = ItemLayerModelTest.VERSION, acceptableRemoteVersions = "*") +public class ItemLayerModelTest { public static final String MODID = "forgedebugitemlayermodel"; public static final String VERSION = "1.0"; diff --git a/src/test/java/net/minecraftforge/debug/ItemModelGenerationTest.java b/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java similarity index 79% rename from src/test/java/net/minecraftforge/debug/ItemModelGenerationTest.java rename to src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java index 4b9e9677fb..d909ee8cf7 100644 --- a/src/test/java/net/minecraftforge/debug/ItemModelGenerationTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java b/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java similarity index 93% rename from src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java index 391d7641b9..4233bcb425 100644 --- a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import com.google.common.collect.ImmutableList; import com.google.common.primitives.Ints; @@ -13,7 +32,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemOverrideList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; @@ -35,7 +53,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; @@ -46,14 +63,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; 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 +@Mod(modid = ModelBakeEventTest.MODID, name = "ForgeDebugModelBakeEvent", version = ModelBakeEventTest.VERSION, acceptableRemoteVersions = "*") +public class ModelBakeEventTest { public static final String MODID = "forgedebugmodelbakeevent"; public static final String VERSION = "1.0"; diff --git a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java b/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java similarity index 88% rename from src/test/java/net/minecraftforge/debug/ModelFluidDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java index c643df2f45..e9792fc807 100644 --- a/src/test/java/net/minecraftforge/debug/ModelFluidDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -18,14 +37,12 @@ import net.minecraftforge.fluids.BlockFluidClassic; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; -@Mod(modid = ModelFluidDebug.MODID, name = "ForgeDebugModelFluid", version = ModelFluidDebug.VERSION, acceptableRemoteVersions = "*") -public class ModelFluidDebug +@Mod(modid = ModelFluidTest.MODID, name = "ForgeDebugModelFluid", version = ModelFluidTest.VERSION, acceptableRemoteVersions = "*") +public class ModelFluidTest { public static final String MODID = "forgedebugmodelfluid"; public static final String VERSION = "1.0"; diff --git a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java similarity index 97% rename from src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java index 969c65d61b..6c3d99843d 100644 --- a/src/test/java/net/minecraftforge/debug/ModelLoaderRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import java.util.Optional; import com.google.common.collect.UnmodifiableIterator; @@ -56,8 +75,8 @@ 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 +@Mod(modid = ModelLoaderRegistryTest.MODID, name = "ForgeDebugModelLoaderRegistry", version = ModelLoaderRegistryTest.VERSION, acceptableRemoteVersions = "*") +public class ModelLoaderRegistryTest { public static final boolean ENABLED = false; public static final String MODID = "forgedebugmodelloaderregistry"; diff --git a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java similarity index 75% rename from src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java rename to src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java index 6eb6e0f8f2..4bc0034898 100644 --- a/src/test/java/net/minecraftforge/debug/MultiLayerModelDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.model; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -16,8 +35,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@Mod(modid = MultiLayerModelDebug.MODID, name = "ForgeDebugMultiLayerModel", version = MultiLayerModelDebug.VERSION, acceptableRemoteVersions = "*") -public class MultiLayerModelDebug +@Mod(modid = MultiLayerModelTest.MODID, name = "ForgeDebugMultiLayerModel", version = MultiLayerModelTest.VERSION, acceptableRemoteVersions = "*") +public class MultiLayerModelTest { private static final boolean ENABLED = true; public static final String MODID = "forgedebugmultilayermodel"; diff --git a/src/test/java/net/minecraftforge/debug/client/model/package-info.java b/src/test/java/net/minecraftforge/debug/client/model/package-info.java new file mode 100644 index 0000000000..2f8f3a98dc --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/client/model/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.client.model; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/client/package-info.java b/src/test/java/net/minecraftforge/debug/client/package-info.java new file mode 100644 index 0000000000..28112f731c --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/client/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.client; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/TransparentFastTesrTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java similarity index 91% rename from src/test/java/net/minecraftforge/debug/TransparentFastTesrTest.java rename to src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java index 440783f291..1dbd148de7 100644 --- a/src/test/java/net/minecraftforge/debug/TransparentFastTesrTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.rendering; import java.util.Collections; import java.util.List; @@ -41,8 +60,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -@Mod(modid = TransparentFastTesrTest.MODID, name = "TransparentFastTESRTest", version = "1.0", acceptableRemoteVersions = "*") -public class TransparentFastTesrTest +@Mod(modid = FastTESRTransparentTest.MODID, name = "TransparentFastTESRTest", version = "1.0", acceptableRemoteVersions = "*") +public class FastTESRTransparentTest { static final String MODID = "transparent_fast_tesr_test"; diff --git a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java similarity index 84% rename from src/test/java/net/minecraftforge/debug/ItemTileDebug.java rename to src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java index 0a162fe69e..ca4dedda3e 100644 --- a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.rendering; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -10,7 +29,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -18,28 +36,19 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.debug.ObjectHolderTest.CustomRegistryEntry; -import net.minecraftforge.debug.ObjectHolderTest.ICustomRegistryEntry; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.registries.RegistryBuilder; import static org.lwjgl.opengl.GL11.*; -@Mod(modid = ItemTileDebug.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*") -public class ItemTileDebug +@Mod(modid = ItemTESRTest.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*") +public class ItemTESRTest { public static final String MODID = "forgedebugitemtile"; @ObjectHolder(TestBlock.name) diff --git a/src/test/java/net/minecraftforge/debug/WRNormalMod.java b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java similarity index 79% rename from src/test/java/net/minecraftforge/debug/WRNormalMod.java rename to src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java index 8065fbccb4..07b9395fcd 100644 --- a/src/test/java/net/minecraftforge/debug/WRNormalMod.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.client.rendering; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -18,10 +37,10 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.EntityRegistry; @Mod(modid = "wrnormal", name = "WRNormal", version = "1.0", acceptableRemoteVersions = "*") -public class WRNormalMod +public class VertexBufferNormalTest { @Instance("wrnormal") - public static WRNormalMod instance; + public static VertexBufferNormalTest instance; @SidedProxy public static ServerProxy proxy; diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/package-info.java b/src/test/java/net/minecraftforge/debug/client/rendering/package-info.java new file mode 100644 index 0000000000..0ac9a950aa --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/client/rendering/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.client.rendering; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java similarity index 64% rename from src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java rename to src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java index 09b2dab624..5af695e850 100644 --- a/src/test/java/net/minecraftforge/debug/EntityUpdateBlockedTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; @@ -10,7 +29,7 @@ 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", acceptableRemoteVersions = "*") -public class EntityUpdateBlockedTest +public class BlockEntityUpdateTest { @Mod.EventHandler public void init(FMLServerStartingEvent event) diff --git a/src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java similarity index 59% rename from src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java index 82ce35a0ad..f2fedc1a1d 100644 --- a/src/test/java/net/minecraftforge/debug/EntityTravelToDimensionEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityTravelToDimensionEvent; diff --git a/src/test/java/net/minecraftforge/debug/CollisionBoxesEventTest.java b/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java similarity index 75% rename from src/test/java/net/minecraftforge/debug/CollisionBoxesEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java index dce610f182..a0da84995e 100644 --- a/src/test/java/net/minecraftforge/debug/CollisionBoxesEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity; import java.util.ArrayList; @@ -23,9 +42,9 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = CollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*") +@Mod(modid = GetCollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber -public class CollisionBoxesEventTest +public class GetCollisionBoxesEventTest { public static final String MODID = "collisionboxexeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/ProjectileImpactEventTest.java b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java similarity index 57% rename from src/test/java/net/minecraftforge/debug/ProjectileImpactEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java index e9cdd76c32..f68c6a709f 100644 --- a/src/test/java/net/minecraftforge/debug/ProjectileImpactEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.ProjectileImpactEvent; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java new file mode 100644 index 0000000000..71e6e22415 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java @@ -0,0 +1,47 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; + +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", acceptableRemoteVersions = "*") +@Mod.EventBusSubscriber +public class AnimalTameEventTest +{ + static final String MOD_ID = "animal_tame_event_test"; + static final boolean ENABLED = false; + + @SubscribeEvent + public static void onAnimalTame(AnimalTameEvent event) + { + if (!ENABLED) + { + return; + } + + if (event.getAnimal() instanceof EntityWolf) + { + event.setCanceled(true); + } + } +} diff --git a/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java new file mode 100644 index 0000000000..79733dcdf6 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java @@ -0,0 +1,49 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; + +import net.minecraft.entity.passive.EntityCow; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod(modid = BabyEntitySpawnEventTest.MODID, name = "BreedingTest", version = "1.0", acceptableRemoteVersions = "*") +public class BabyEntitySpawnEventTest +{ + public static final String MODID = "breedingtest"; + static final boolean ENABLED = false; + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) + { + if (ENABLED) + { + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void onBabyBorn(BabyEntitySpawnEvent event) + { + event.setChild(new EntityCow(event.getParentA().world)); + } +} diff --git a/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java new file mode 100644 index 0000000000..970c574bbe --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java @@ -0,0 +1,50 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingSpawnEvent.CheckSpawn; +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.Event.Result; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod(modid = CheckSpawnEventTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*") +public class CheckSpawnEventTest +{ + public static final String MODID = "checkspawntest"; + public static final boolean ENABLED = false; + + @EventHandler + public void onPreInit(FMLPreInitializationEvent event) + { + if (ENABLED) + { + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void canMobSpawn(CheckSpawn event) + { + event.setResult(Result.DENY); + } +} diff --git a/src/test/java/net/minecraftforge/debug/LivingDamageEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java similarity index 84% rename from src/test/java/net/minecraftforge/debug/LivingDamageEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java index 8ac95e0d2d..de74ad9e87 100644 --- a/src/test/java/net/minecraftforge/debug/LivingDamageEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; import com.google.common.collect.ImmutableMap; import java.util.Collections; @@ -24,8 +43,8 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = LivingDamageEventTest.MODID, name = "ForgeDebugLivingDamage", version = "1.0", acceptableRemoteVersions = "*") -public class LivingDamageEventTest +@Mod(modid = DamageEventTest.MODID, name = "ForgeDebugLivingDamage", version = "1.0", acceptableRemoteVersions = "*") +public class DamageEventTest { private static Logger logger; diff --git a/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java similarity index 95% rename from src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java rename to src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java index cbd7834d5e..c6bc4bf0d1 100644 --- a/src/test/java/net/minecraftforge/debug/EquipmentChangeTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + */ -package net.minecraftforge.debug; +package net.minecraftforge.debug.entity.living; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEquipmentChangeEvent; @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; @Mod(modid = "equipment_change_test", name = "Equipment Change Test", version = "1.0.0", acceptableRemoteVersions = "*") -public class EquipmentChangeTest +public class EquipmentChangeEventTest { private static final boolean ENABLED = false; private static Logger logger; diff --git a/src/test/java/net/minecraftforge/debug/KnockBackHookTest.java b/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java similarity index 50% rename from src/test/java/net/minecraftforge/debug/KnockBackHookTest.java rename to src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java index ac498b42d0..170dc8cedd 100644 --- a/src/test/java/net/minecraftforge/debug/KnockBackHookTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntitySheep; @@ -8,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "kbhtest", name = "Knock Back Hook Test", version = "1.0", acceptableRemoteVersions = "*") @Mod.EventBusSubscriber -public class KnockBackHookTest +public class KnockBackEventTest { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java b/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java similarity index 55% rename from src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java rename to src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java index a058212892..e9516ce04d 100644 --- a/src/test/java/net/minecraftforge/debug/VillagerProfessionTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.living; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/package-info.java b/src/test/java/net/minecraftforge/debug/entity/living/package-info.java new file mode 100644 index 0000000000..b2cac0a54d --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/living/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.entity.living; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/entity/package-info.java b/src/test/java/net/minecraftforge/debug/entity/package-info.java new file mode 100644 index 0000000000..4a4e2a0bb1 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.entity; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/CriticalHitEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/CriticalHitEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java index a5bc82ca51..e35698fee6 100644 --- a/src/test/java/net/minecraftforge/debug/CriticalHitEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.CriticalHitEvent; diff --git a/src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java similarity index 69% rename from src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java rename to src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java index 25c360954c..dad852f291 100644 --- a/src/test/java/net/minecraftforge/debug/PlayerDamageReworkTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import java.util.UUID; @@ -13,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0", acceptableRemoteVersions = "*") -public class PlayerDamageReworkTest +public class DamageReworkTest { private static final boolean ENABLE = false; private static final UUID ARMOR_MODIFIER_UUID = UUID.fromString("23373DC8-1F3D-11E7-93AE-92361F002671"); diff --git a/src/test/java/net/minecraftforge/debug/PlayerItemPickupEventDebug.java b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java similarity index 52% rename from src/test/java/net/minecraftforge/debug/PlayerItemPickupEventDebug.java rename to src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java index 7e332ea645..a307c11c4b 100644 --- a/src/test/java/net/minecraftforge/debug/PlayerItemPickupEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java @@ -1,17 +1,35 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import org.apache.logging.log4j.Logger; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; -@Mod(modid = PlayerItemPickupEventDebug.MODID, name = PlayerItemPickupEventDebug.NAME, version = PlayerItemPickupEventDebug.VERSION, acceptableRemoteVersions = "*") -public class PlayerItemPickupEventDebug +@Mod(modid = ItemPickupEventTest.MODID, name = ItemPickupEventTest.NAME, version = ItemPickupEventTest.VERSION, acceptableRemoteVersions = "*") +public class ItemPickupEventTest { private static final boolean ENABLED = true; diff --git a/src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java similarity index 92% rename from src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java rename to src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java index 5a4757be7c..9c173f9987 100644 --- a/src/test/java/net/minecraftforge/debug/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.entity.monster.EntitySkeleton; diff --git a/src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java similarity index 57% rename from src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java rename to src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java index 5cc3cffb37..751e29a160 100644 --- a/src/test/java/net/minecraftforge/debug/PlayerSetSpawnTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerSetSpawnEvent; diff --git a/src/test/java/net/minecraftforge/debug/ReachDistanceAttributeTest.java b/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/ReachDistanceAttributeTest.java rename to src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java index 67582064c4..6cc47e8d93 100644 --- a/src/test/java/net/minecraftforge/debug/ReachDistanceAttributeTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.entity.player; import com.google.common.collect.Multimap; import net.minecraft.client.renderer.block.model.ModelResourceLocation; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/package-info.java b/src/test/java/net/minecraftforge/debug/entity/player/package-info.java new file mode 100644 index 0000000000..2b4f75c98d --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/player/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.entity.player; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/FluidAdditionalFieldsTest.java b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java similarity index 67% rename from src/test/java/net/minecraftforge/debug/FluidAdditionalFieldsTest.java rename to src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java index 31224b889d..b85e26d109 100644 --- a/src/test/java/net/minecraftforge/debug/FluidAdditionalFieldsTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.fluid; import java.awt.Color; @@ -17,9 +36,9 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@Mod(modid = FluidAdditionalFieldsTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*") +@Mod(modid = ColoredFluidTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*") @EventBusSubscriber -public class FluidAdditionalFieldsTest +public class ColoredFluidTest { static final boolean ENABLED = false; // <-- enable mod static final Color COLOR = Color.PINK; // <-- change this to try other colors diff --git a/src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java similarity index 54% rename from src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java rename to src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java index 4e14961634..e335d251c9 100644 --- a/src/test/java/net/minecraftforge/debug/CreateFluidSourceTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.fluid; import net.minecraft.init.Blocks; import net.minecraftforge.common.MinecraftForge; @@ -9,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "createfluidsourcetest", name = "CreateFluidSourceTest", version = "1.0", acceptableRemoteVersions = "*") -public class CreateFluidSourceTest +public class CreateFluidSourceEventTest { public static final boolean ENABLE = false; @@ -18,7 +37,7 @@ public class CreateFluidSourceTest { if (ENABLE) { - MinecraftForge.EVENT_BUS.register(CreateFluidSourceTest.class); + MinecraftForge.EVENT_BUS.register(CreateFluidSourceEventTest.class); } } diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java similarity index 91% rename from src/test/java/net/minecraftforge/debug/DynBucketTest.java rename to src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java index b23e1c0041..c4eb506804 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.fluid; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; @@ -19,13 +38,11 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; 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; @@ -36,8 +53,9 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.debug.ModelFluidDebug.TestFluid; -import net.minecraftforge.debug.ModelFluidDebug.TestGas; +import net.minecraftforge.debug.client.model.ModelFluidTest; +import net.minecraftforge.debug.client.model.ModelFluidTest.TestFluid; +import net.minecraftforge.debug.client.model.ModelFluidTest.TestGas; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.player.FillBucketEvent; import net.minecraftforge.fluids.Fluid; @@ -53,7 +71,6 @@ import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -68,7 +85,7 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidDebug.MODID, acceptableRemoteVersions = "*") +@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidTest.MODID, acceptableRemoteVersions = "*") public class DynBucketTest { public static final String MODID = "dynbuckettest"; @@ -89,7 +106,7 @@ public class DynBucketTest static { - if (ENABLE && ModelFluidDebug.ENABLE) + if (ENABLE && ModelFluidTest.ENABLE) { FluidRegistry.enableUniversalBucket(); } @@ -118,7 +135,7 @@ public class DynBucketTest @SubscribeEvent public void registerRecipes(RegistryEvent.Register event) { - ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidDebug.FLUID, Fluid.BUCKET_VOLUME)); + ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidTest.FLUID, Fluid.BUCKET_VOLUME)); GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.fromItem(Items.DIAMOND)); } @@ -128,7 +145,7 @@ public class DynBucketTest { logger = event.getModLog(); - if (ENABLE && ModelFluidDebug.ENABLE) + if (ENABLE && ModelFluidTest.ENABLE) { MinecraftForge.EVENT_BUS.register(this); } @@ -168,7 +185,7 @@ public class DynBucketTest @SubscribeEvent public static void setupModels(ModelRegistryEvent event) { - if (!ENABLE || !ModelFluidDebug.ENABLE) return; + if (!ENABLE || !ModelFluidTest.ENABLE) return; ModelLoader.setBucketModelDefinition(DYN_BOTTLE); diff --git a/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java b/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java similarity index 90% rename from src/test/java/net/minecraftforge/debug/FluidPlacementTest.java rename to src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java index fa63f7594d..c4c4ffc44c 100644 --- a/src/test/java/net/minecraftforge/debug/FluidPlacementTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java @@ -1,9 +1,27 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.fluid; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; @@ -23,6 +41,7 @@ import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.debug.client.model.ModelFluidTest; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; @@ -32,9 +51,6 @@ 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; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -59,7 +75,7 @@ public class FluidPlacementTest @SubscribeEvent public static void registerBlocks(RegistryEvent.Register event) { - if (!ENABLE || !ModelFluidDebug.ENABLE) + if (!ENABLE || !ModelFluidTest.ENABLE) return; event.getRegistry().registerAll( FiniteFluidBlock.instance @@ -69,7 +85,7 @@ public class FluidPlacementTest @SubscribeEvent public static void registerItems(RegistryEvent.Register event) { - if (!ENABLE || !ModelFluidDebug.ENABLE) + if (!ENABLE || !ModelFluidTest.ENABLE) return; FluidRegistry.registerFluid(FiniteFluid.instance); FluidRegistry.addBucketForFluid(FiniteFluid.instance); @@ -88,7 +104,7 @@ public class FluidPlacementTest @SubscribeEvent public static void registerModels(ModelRegistryEvent event) { - if (!ENABLE || !ModelFluidDebug.ENABLE) + if (!ENABLE || !ModelFluidTest.ENABLE) return; ModelResourceLocation fluidLocation = new ModelResourceLocation(MODID.toLowerCase() + ":" + FiniteFluidBlock.name, "normal"); @@ -249,7 +265,7 @@ public class FluidPlacementTest { if (!this.isInCreativeTab(tab)) return; - Fluid[] fluids = new Fluid[]{FluidRegistry.WATER, FluidRegistry.LAVA, FiniteFluid.instance, ModelFluidDebug.FLUID}; + Fluid[] fluids = new Fluid[]{FluidRegistry.WATER, FluidRegistry.LAVA, FiniteFluid.instance, ModelFluidTest.FLUID}; // add 16 variable fillings for (Fluid fluid : fluids) { diff --git a/src/test/java/net/minecraftforge/debug/FluidHandlerTest.java b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java similarity index 85% rename from src/test/java/net/minecraftforge/debug/FluidHandlerTest.java rename to src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java index 48a7301cb1..4da78335c8 100644 --- a/src/test/java/net/minecraftforge/debug/FluidHandlerTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.fluid; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -20,7 +39,7 @@ import javax.annotation.Nullable; import java.util.List; @Mod(modid = "fluidhandlertest", name = "FluidHandlerTest", version = "0.0.0", clientSideOnly = true) -public class FluidHandlerTest +public class ItemFluidHandlerTest { public static final boolean ENABLE = false; private static Logger logger; diff --git a/src/test/java/net/minecraftforge/debug/fluid/package-info.java b/src/test/java/net/minecraftforge/debug/fluid/package-info.java new file mode 100644 index 0000000000..b22b97c09f --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/fluid/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.fluid; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java similarity index 76% rename from src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java index 015246fa65..a291d96f49 100644 --- a/src/test/java/net/minecraftforge/debug/BrewingRecipeRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/test/java/net/minecraftforge/debug/CraftingSystemTest.java b/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java similarity index 69% rename from src/test/java/net/minecraftforge/debug/CraftingSystemTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java index 4b261a7143..a6b597e4de 100644 --- a/src/test/java/net/minecraftforge/debug/CraftingSystemTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import com.google.gson.JsonObject; diff --git a/src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java similarity index 57% rename from src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java index 8b9ecb4054..776d8997fe 100644 --- a/src/test/java/net/minecraftforge/debug/DifficultyChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.DifficultyChangeEvent; diff --git a/src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java similarity index 57% rename from src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java index 0c11ce4670..bc2362540d 100644 --- a/src/test/java/net/minecraftforge/debug/EnchantmentLevelSetTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.enchanting.EnchantmentLevelSetEvent; @@ -8,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; @Mod(modid = "enchantmentlevelsettest", name = "EnchantmentLevelSetTest", version = "1.0", acceptableRemoteVersions = "*") -public class EnchantmentLevelSetTest +public class EnchantmentLevelSetEventTest { public static final boolean ENABLE = false; private static Logger logger; @@ -20,7 +39,7 @@ public class EnchantmentLevelSetTest { logger = event.getModLog(); logger.info("Wiring up enchantment level set test"); - MinecraftForge.EVENT_BUS.register(EnchantmentLevelSetTest.class); + MinecraftForge.EVENT_BUS.register(EnchantmentLevelSetEventTest.class); } } diff --git a/src/test/java/net/minecraftforge/debug/FurnaceFuelBurnTimeEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java similarity index 83% rename from src/test/java/net/minecraftforge/debug/FurnaceFuelBurnTimeEventTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java index 5802c0dd66..811a8a698b 100644 --- a/src/test/java/net/minecraftforge/debug/FurnaceFuelBurnTimeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; diff --git a/src/test/java/net/minecraftforge/debug/InputUpdateEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java similarity index 69% rename from src/test/java/net/minecraftforge/debug/InputUpdateEventTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java index 11b7e0c09c..2c39391c41 100644 --- a/src/test/java/net/minecraftforge/debug/InputUpdateEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java similarity index 90% rename from src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java index 626f343735..1bf12905f6 100644 --- a/src/test/java/net/minecraftforge/debug/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java similarity index 85% rename from src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java rename to src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java index 5bdb86a76c..7d0cb8bf86 100644 --- a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import gnu.trove.set.TIntSet; import gnu.trove.set.hash.TIntHashSet; @@ -16,12 +35,11 @@ import net.minecraftforge.common.ForgeVersion; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.registries.GameData; import java.util.Random; -@Mod(modid = PotionRegistryDebug.MODID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*") -public class PotionRegistryDebug +@Mod(modid = PotionRegistryTest.MODID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*") +public class PotionRegistryTest { public static final String MODID = "forgepotionregistry"; diff --git a/src/test/java/net/minecraftforge/debug/RecipeTestMod.java b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java similarity index 79% rename from src/test/java/net/minecraftforge/debug/RecipeTestMod.java rename to src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java index df3e1b8275..e0701cb9fc 100644 --- a/src/test/java/net/minecraftforge/debug/RecipeTestMod.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay; import java.util.Random; @@ -9,25 +28,21 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraft.util.EnumActionResult; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.debug.OnItemUseFirstTest.CommonProxy; -import net.minecraftforge.debug.OnItemUseFirstTest.ItemTest; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.FMLLaunchHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.oredict.ShapedOreRecipe; -@Mod(modid = RecipeTestMod.MODID, name = "Recipe test mod", version = "1.0", acceptableRemoteVersions = "*") -public class RecipeTestMod +@Mod(modid = RecipeMatchingTest.MODID, name = "Recipe test mod", version = "1.0", acceptableRemoteVersions = "*") +public class RecipeMatchingTest { public static final String MODID = "recipetest"; private static final boolean ENABLED = true; diff --git a/src/test/java/net/minecraftforge/debug/AdvancementCriterionTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java similarity index 59% rename from src/test/java/net/minecraftforge/debug/AdvancementCriterionTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java index d1c7b9b066..e54b8223bd 100644 --- a/src/test/java/net/minecraftforge/debug/AdvancementCriterionTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.advancement; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.critereon.PositionTrigger; diff --git a/src/test/java/net/minecraftforge/debug/AdvancementEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java similarity index 61% rename from src/test/java/net/minecraftforge/debug/AdvancementEventTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java index 1eac88b7e0..0d2f199096 100644 --- a/src/test/java/net/minecraftforge/debug/AdvancementEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.advancement; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.AdvancementEvent; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java new file mode 100644 index 0000000000..787f4ba167 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java @@ -0,0 +1,27 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.advancement; + +import net.minecraftforge.fml.common.Mod; + +@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*") +public class AdvancementsPaginationTest +{ +} diff --git a/src/test/java/net/minecraftforge/debug/OredictItemPredicateTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java similarity index 85% rename from src/test/java/net/minecraftforge/debug/OredictItemPredicateTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java index 07c154bfc2..fb3218b6e9 100644 --- a/src/test/java/net/minecraftforge/debug/OredictItemPredicateTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.advancement; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; @@ -28,8 +47,8 @@ import java.util.Set; * This mod tests ore-dict advancement triggers. */ @Mod.EventBusSubscriber -@Mod(modid = OredictItemPredicateTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*") -public class OredictItemPredicateTest +@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*") +public class OredictTriggerTest { public static final String MODID = "oredict_predicate"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/package-info.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/package-info.java new file mode 100644 index 0000000000..288da60473 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.gameplay.advancement; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/LootContextTweaksTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java similarity index 85% rename from src/test/java/net/minecraftforge/debug/LootContextTweaksTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java index 0dfc854b51..ab1b07b504 100644 --- a/src/test/java/net/minecraftforge/debug/LootContextTweaksTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.loot; import java.util.Random; diff --git a/src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java similarity index 63% rename from src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java rename to src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java index 74b19a0763..74bedd66dd 100644 --- a/src/test/java/net/minecraftforge/debug/LootTableLoadEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.loot; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootTable; diff --git a/src/test/java/net/minecraftforge/debug/LootTablesDebug.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java similarity index 70% rename from src/test/java/net/minecraftforge/debug/LootTablesDebug.java rename to src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java index 16f9cbc258..6fb6b2d6a1 100644 --- a/src/test/java/net/minecraftforge/debug/LootTablesDebug.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.gameplay.loot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; @@ -16,8 +35,8 @@ import net.minecraftforge.fml.common.Mod; 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 +@Mod(modid = LootTableTest.MODID, name = "Loot Table Debug", version = "1.0", acceptableRemoteVersions = "*") +public class LootTableTest { public static final String MODID = "loot_table_debug"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/package-info.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/package-info.java new file mode 100644 index 0000000000..38ad8179aa --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.gameplay.loot; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/gameplay/package-info.java b/src/test/java/net/minecraftforge/debug/gameplay/package-info.java new file mode 100644 index 0000000000..d8d1fb8656 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.gameplay; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/BonemealEventTest.java b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java similarity index 67% rename from src/test/java/net/minecraftforge/debug/BonemealEventTest.java rename to src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java index baa3969fe8..fc0dc59a5d 100644 --- a/src/test/java/net/minecraftforge/debug/BonemealEventTest.java +++ b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.util.EnumHand; import net.minecraftforge.common.MinecraftForge; @@ -9,7 +28,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, name = "Bonemeal Event Test", version = "1.0", acceptableRemoteVersions = "*") +@Mod(modid = BonemealEventTest.MODID, name = "Bonemeal Event Test", version = "1.0", acceptableRemoteVersions = "*", dependencies = "required-after:asdkfaskld") public class BonemealEventTest { public static final String MODID = "bonemealeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java b/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java similarity index 73% rename from src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java rename to src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java index 47528f47ee..8912db2727 100644 --- a/src/test/java/net/minecraftforge/debug/CanApplyAtEnchantingTableTest.java +++ b/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.enchantment.Enchantment; diff --git a/src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java b/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java similarity index 56% rename from src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java rename to src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java index e397359007..bc8ae2fda7 100644 --- a/src/test/java/net/minecraftforge/debug/ItemCanDestroyBlocksInCreativeTest.java +++ b/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +29,8 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = ItemCanDestroyBlocksInCreativeTest.MODID, name = "Item.canDestroyBlockInCreative() Test", version = "1.0", acceptableRemoteVersions = "*") -public class ItemCanDestroyBlocksInCreativeTest +@Mod(modid = CanDestroyBlocksInCreativeTest.MODID, name = "Item.canDestroyBlockInCreative() Test", version = "1.0", acceptableRemoteVersions = "*") +public class CanDestroyBlocksInCreativeTest { public static final boolean ENABLE = true; public static final String MODID = "item_can_destroy_blocks_in_creative_test"; diff --git a/src/test/java/net/minecraftforge/debug/HorseArmorTest.java b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java similarity index 79% rename from src/test/java/net/minecraftforge/debug/HorseArmorTest.java rename to src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java index 94d498865d..0c8ed90843 100644 --- a/src/test/java/net/minecraftforge/debug/HorseArmorTest.java +++ b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.EntityLiving; diff --git a/src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java b/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java rename to src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java index 3e14ea6835..901f9f9fbc 100644 --- a/src/test/java/net/minecraftforge/debug/IsBookEnchantableTest.java +++ b/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/test/java/net/minecraftforge/debug/ItemFishedTest.java b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java similarity index 64% rename from src/test/java/net/minecraftforge/debug/ItemFishedTest.java rename to src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java index 903d4d61d2..1cd01f4da1 100644 --- a/src/test/java/net/minecraftforge/debug/ItemFishedTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraft.init.Biomes; @@ -12,7 +31,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.Logger; @Mod(modid = "itemfishtest", name = "ItemFishTest", version = "1.0.0", acceptableRemoteVersions = "*") -public class ItemFishedTest +public class ItemFishedEventTest { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/MapDataTest.java b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java similarity index 92% rename from src/test/java/net/minecraftforge/debug/MapDataTest.java rename to src/test/java/net/minecraftforge/debug/item/MapDataTest.java index 34d0df5faa..d38becbc8a 100644 --- a/src/test/java/net/minecraftforge/debug/MapDataTest.java +++ b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import io.netty.buffer.ByteBuf; import net.minecraft.block.material.MapColor; diff --git a/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java b/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java similarity index 80% rename from src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java rename to src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java index c0ed610ab8..e632c0a6d0 100644 --- a/src/test/java/net/minecraftforge/debug/NBTShareTagItemTest.java +++ b/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; @@ -19,8 +38,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import javax.annotation.Nullable; -@Mod(modid = NBTShareTagItemTest.MODID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*") -public class NBTShareTagItemTest +@Mod(modid = NBTShareTagTest.MODID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*") +public class NBTShareTagTest { public static final String MODID = "nbtsharetagitemtest"; private static final ResourceLocation itemName = new ResourceLocation(MODID, "nbt_share_tag_item"); diff --git a/src/test/java/net/minecraftforge/debug/OnItemUseFirstTest.java b/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java similarity index 81% rename from src/test/java/net/minecraftforge/debug/OnItemUseFirstTest.java rename to src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java index 3e3d5d5630..6c90759ff4 100644 --- a/src/test/java/net/minecraftforge/debug/OnItemUseFirstTest.java +++ b/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java b/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java similarity index 81% rename from src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java rename to src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java index cdceeb87d2..5c2860b83c 100644 --- a/src/test/java/net/minecraftforge/debug/PotionCurativeItemDebug.java +++ b/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.entity.player.EntityPlayer; @@ -27,8 +46,8 @@ 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.MODID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*") -public class PotionCurativeItemDebug +@Mod(modid = PotionCurabilityTest.MODID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*") +public class PotionCurabilityTest { public static final boolean ENABLED = false; public static final String MODID = "potion_curative_item_debug"; diff --git a/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java similarity index 51% rename from src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java rename to src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java index c048a61959..b9cb8be6bb 100644 --- a/src/test/java/net/minecraftforge/debug/NoPotionEffectRenderTest.java +++ b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -7,8 +26,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; -@Mod(modid = NoPotionEffectRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*") -public class NoPotionEffectRenderTest +@Mod(modid = PotionShouldRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class PotionShouldRenderTest { public static final String modID = "nopotioneffect"; diff --git a/src/test/java/net/minecraftforge/debug/ShieldTest.java b/src/test/java/net/minecraftforge/debug/item/ShieldTest.java similarity index 82% rename from src/test/java/net/minecraftforge/debug/ShieldTest.java rename to src/test/java/net/minecraftforge/debug/item/ShieldTest.java index 60b0ce3d8a..65b8498c7e 100644 --- a/src/test/java/net/minecraftforge/debug/ShieldTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ShieldTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.item; import com.google.common.collect.Multimap; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -16,7 +35,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/test/java/net/minecraftforge/debug/item/package-info.java b/src/test/java/net/minecraftforge/debug/item/package-info.java new file mode 100644 index 0000000000..36190dcff7 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/item/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.item; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java similarity index 68% rename from src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java rename to src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java index 552b3a0c82..d88507972c 100644 --- a/src/test/java/net/minecraftforge/debug/EnumPlantTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.misc; import net.minecraftforge.common.BiomeManager.BiomeType; import net.minecraftforge.common.EnumPlantType; diff --git a/src/test/java/net/minecraftforge/debug/misc/package-info.java b/src/test/java/net/minecraftforge/debug/misc/package-info.java new file mode 100644 index 0000000000..840fe43820 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/misc/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.misc; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java similarity index 93% rename from src/test/java/net/minecraftforge/debug/TestCapabilityMod.java rename to src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java index 7c551d7519..1191be5f13 100644 --- a/src/test/java/net/minecraftforge/debug/TestCapabilityMod.java +++ b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.mod; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -32,7 +51,7 @@ import javax.annotation.Nullable; import java.util.List; @Mod(modid = "forge.testcapmod", name = "Forge TestCapMod", version = "1.0", acceptableRemoteVersions = "*") -public class TestCapabilityMod +public class CapabilityTest { // A Holder/Marker for if this capability is installed. // MUST be Static final doesn't matter but is suggested to prevent diff --git a/src/test/java/net/minecraftforge/debug/ClientExceptionTestMod.java b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java similarity index 77% rename from src/test/java/net/minecraftforge/debug/ClientExceptionTestMod.java rename to src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java index c4125753d5..3a344d7a9f 100644 --- a/src/test/java/net/minecraftforge/debug/ClientExceptionTestMod.java +++ b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.mod; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiErrorScreen; @@ -14,7 +33,7 @@ import net.minecraftforge.fml.common.event.FMLServerStartedEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = "clientexceptiontest", version = "1.0", name = "Client Exception Test", clientSideOnly = true) -public class ClientExceptionTestMod +public class ClientLoadingExceptionTest { // Disabled so other test mods can still work. diff --git a/src/test/java/net/minecraftforge/debug/ConfigTest.java b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java similarity index 86% rename from src/test/java/net/minecraftforge/debug/ConfigTest.java rename to src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java index d8225a8dd8..d62f579387 100644 --- a/src/test/java/net/minecraftforge/debug/ConfigTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.mod; import com.google.common.collect.Maps; import net.minecraftforge.common.MinecraftForge; @@ -21,8 +40,8 @@ import org.apache.logging.log4j.Logger; import java.util.HashMap; import java.util.Map; -@Mod(modid = ConfigTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*") -public class ConfigTest +@Mod(modid = ConfigAnnotationTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*") +public class ConfigAnnotationTest { public static final String MODID = "config_test"; private static Logger logger; diff --git a/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java similarity index 76% rename from src/test/java/net/minecraftforge/debug/ObjectHolderTest.java rename to src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java index 61237b3e09..90ba72d044 100644 --- a/src/test/java/net/minecraftforge/debug/ObjectHolderTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.mod; import net.minecraft.block.Block; import net.minecraft.potion.Potion; @@ -12,8 +31,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.RegistryBuilder; -@Mod(modid = ObjectHolderTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*") -public class ObjectHolderTest +@Mod(modid = ObjectHolderAnnotationTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*") +public class ObjectHolderAnnotationTest { public static final String MODID = "objectholdertest"; @@ -62,7 +81,7 @@ public class ObjectHolderTest 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 + new ObjectHolderAnnotationTest.PotionForge(new ResourceLocation(ObjectHolderAnnotationTest.MODID, "forge_potion"), false, 0xff00ff) // test automatic id distribution ); } @@ -115,14 +134,14 @@ public class ObjectHolderTest public static final Block nonExistentBlock = null; } - @GameRegistry.ObjectHolder(ObjectHolderTest.MODID) + @GameRegistry.ObjectHolder(ObjectHolderAnnotationTest.MODID) static class ForgeObjectHolder { //Tests using subclasses for injections - public static final ObjectHolderTest.PotionForge forge_potion = null; + public static final ObjectHolderAnnotationTest.PotionForge forge_potion = null; } - @GameRegistry.ObjectHolder(ObjectHolderTest.MODID) + @GameRegistry.ObjectHolder(ObjectHolderAnnotationTest.MODID) static class CustomRegistryObjectHolder { //Tests whether custom registries can be used diff --git a/src/test/java/net/minecraftforge/debug/PermissionTest.java b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java similarity index 89% rename from src/test/java/net/minecraftforge/debug/PermissionTest.java rename to src/test/java/net/minecraftforge/debug/mod/PermissionTest.java index 1bf1363445..bc87b52471 100644 --- a/src/test/java/net/minecraftforge/debug/PermissionTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.mod; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; diff --git a/src/test/java/net/minecraftforge/debug/RegistryOverrideTest.java b/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java similarity index 98% rename from src/test/java/net/minecraftforge/debug/RegistryOverrideTest.java rename to src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java index a3d45aa88c..0f35529ba5 100644 --- a/src/test/java/net/minecraftforge/debug/RegistryOverrideTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java @@ -16,7 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package net.minecraftforge.debug; +package net.minecraftforge.debug.mod; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/test/java/net/minecraftforge/debug/mod/package-info.java b/src/test/java/net/minecraftforge/debug/mod/package-info.java new file mode 100644 index 0000000000..49bd43103f --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/mod/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.mod; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/BigNetworkMessageTest.java b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/BigNetworkMessageTest.java rename to src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java index 02fba7985f..9055047465 100644 --- a/src/test/java/net/minecraftforge/debug/BigNetworkMessageTest.java +++ b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java @@ -1,8 +1,26 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.network; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; -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; diff --git a/src/test/java/net/minecraftforge/debug/network/package-info.java b/src/test/java/net/minecraftforge/debug/network/package-info.java new file mode 100644 index 0000000000..7809b68ace --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/network/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.network; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/ModNameTooltip.java b/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java similarity index 67% rename from src/test/java/net/minecraftforge/debug/ModNameTooltip.java rename to src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java index 2277a9168f..a8f835a95d 100644 --- a/src/test/java/net/minecraftforge/debug/ModNameTooltip.java +++ b/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.util; import javax.annotation.Nullable; import java.util.List; diff --git a/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java b/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java similarity index 76% rename from src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java rename to src/test/java/net/minecraftforge/debug/util/RotatingWrench.java index 0c8ccea2d2..5c6a89dae1 100644 --- a/src/test/java/net/minecraftforge/debug/WrenchRotateDebug.java +++ b/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.util; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -21,8 +40,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@Mod(modid = WrenchRotateDebug.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*") -public class WrenchRotateDebug +@Mod(modid = RotatingWrench.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*") +public class RotatingWrench { public static final String modID = "wrenchrotatedebug"; private static final ResourceLocation testWrenchName = new ResourceLocation(modID, "test_wrench"); diff --git a/src/test/java/net/minecraftforge/debug/TextureDump.java b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java similarity index 74% rename from src/test/java/net/minecraftforge/debug/TextureDump.java rename to src/test/java/net/minecraftforge/debug/util/TextureDumper.java index c14679845d..25c7ded366 100644 --- a/src/test/java/net/minecraftforge/debug/TextureDump.java +++ b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.util; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraftforge.client.event.TextureStitchEvent; @@ -17,8 +36,8 @@ import java.io.File; import java.io.IOException; import java.nio.IntBuffer; -@Mod(modid = TextureDump.MODID, name = "Forge Texture Atlas Dump", version = TextureDump.VERSION, clientSideOnly = true) -public class TextureDump +@Mod(modid = TextureDumper.MODID, name = "Forge Texture Atlas Dump", version = TextureDumper.VERSION, clientSideOnly = true) +public class TextureDumper { public static final String MODID = "forge_texture_dump"; public static final String VERSION = "1.0"; diff --git a/src/test/java/net/minecraftforge/debug/util/package-info.java b/src/test/java/net/minecraftforge/debug/util/package-info.java new file mode 100644 index 0000000000..4955ad64bd --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/util/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.util; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java similarity index 86% rename from src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java rename to src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java index e1eb211dca..d1fd519237 100644 --- a/src/test/java/net/minecraftforge/debug/ChunkCapabilityPollutionTest.java +++ b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.world; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -28,8 +47,9 @@ import javax.annotation.Nullable; * Simple mod to test chunk capabilities. * Use flint and steel to increase pollution in a chunk and saplings to decrease pollution in a chunk. */ -@Mod(modid = ChunkCapabilityPollutionTest.MODID, name = "Chunk Capability Test", version = "0.0.0", acceptableRemoteVersions = "*") -public class ChunkCapabilityPollutionTest { +@Mod(modid = ChunkCapabilityTest.MODID, name = "Chunk Capability Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class ChunkCapabilityTest +{ public static final String MODID = "chunkcapabilitypollutiontest"; public static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java similarity index 58% rename from src/test/java/net/minecraftforge/debug/DecorateEventDebug.java rename to src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java index dfc3405679..77ef87c267 100644 --- a/src/test/java/net/minecraftforge/debug/DecorateEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.world; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; diff --git a/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java b/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java new file mode 100644 index 0000000000..49794608c5 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java @@ -0,0 +1,60 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.world; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +@Mod(modid = SpawnDimensionTest.MODID, name = "CustomSpawnDimensionTest", version = "0.1", acceptableRemoteVersions = "*") +public class SpawnDimensionTest +{ + public static final String MODID = "customspawndimensiontest"; + + private static final boolean ENABLE = false; + + public SpawnDimensionTest() + { + if (ENABLE) + { + MinecraftForge.EVENT_BUS.register(this); + } + } + + @SubscribeEvent + public void enterDimension(EntityJoinWorldEvent event) + { + Entity e = event.getEntity(); + if (!(e instanceof EntityPlayer)) + { + return; + } + + BlockPos pos = e.getPosition(); + int dim = e.dimension; + + ((EntityPlayer) e).setSpawnDimension(dim); + ((EntityPlayer) e).setSpawnChunk(pos, true, dim); + } +} diff --git a/src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java similarity index 82% rename from src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java rename to src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java index 81cabd3b29..9b23b484d0 100644 --- a/src/test/java/net/minecraftforge/debug/TileEntityLoadingTest.java +++ b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.world; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java similarity index 86% rename from src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java rename to src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java index 1f6d5ce12b..1623ac5b05 100644 --- a/src/test/java/net/minecraftforge/debug/WorldCapabilityRainTimerTest.java +++ b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java @@ -1,4 +1,23 @@ -package net.minecraftforge.debug; +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.debug.world; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -24,8 +43,8 @@ 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 +@Mod(modid = WorldCapabilityTest.MODID, name = "World Periodic Rain Check Test", version = "0.0.0", acceptableRemoteVersions = "*") +public class WorldCapabilityTest { public static final String MODID = "worldperiodicrainchecktest"; static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/world/package-info.java b/src/test/java/net/minecraftforge/debug/world/package-info.java new file mode 100644 index 0000000000..9ed2a2b2bf --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/world/package-info.java @@ -0,0 +1,25 @@ +/* + * Minecraft Forge + * Copyright (c) 2016. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +package net.minecraftforge.debug.world; + +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file