Fix objloader registering at wrong time. Closes #5847. Added test

class as suggested in the issue.

Note: most tests are commented out at the present time, pending
rework. Tests that work, work.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>

src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java

@@ -63,7 +63,7 @@ public class ModelLoaderRegistry
     private static IResourceManager manager;
 
     // Forge built-in loaders
-    static
+    public static void init()
     {
         registerLoader(B3DLoader.INSTANCE);
         registerLoader(OBJLoader.INSTANCE);

src/main/java/net/minecraftforge/fml/client/ClientModLoader.java

@@ -27,6 +27,7 @@ import net.minecraft.resources.*;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.ForgeConfig;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.Event;
@@ -68,6 +69,7 @@ public class ClientModLoader
         ResourcePackLoader.loadResourcePacks(defaultResourcePacks);
         mcResourceManager.addReloadListener(ClientModLoader::onreload);
         mcResourceManager.addReloadListener(BrandingControl.resourceManagerReloadListener());
+        ModelLoaderRegistry.init();
     }
 
     private static CompletableFuture<Void> onreload(final IFutureReloadListener.IStage stage, final IResourceManager resourceManager, final IProfiler prepareProfiler, final IProfiler executeProfiler, final Executor asyncExecutor, final Executor syncExecutor) {

src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -185,3 +186,4 @@ public class FarmlandWaterTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -110,7 +111,8 @@ public class ParticleEffectsTest
         event.getRegistry().register(item.setRegistryName(particleBlockLocation));
     }
 
-    /*
+    */
+/*
     @EventBusSubscriber(value = Dist.CLIENT, modid = MOD_ID)
     public static class ClientEventHandler
     {
@@ -131,5 +133,7 @@ public class ParticleEffectsTest
             ModelLoader.setCustomModelResourceLocation(PARTICLE_ITEM, 0, invLoc);
         }
     }
-    */
+    *//*
+
 }
+*/

src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -38,3 +39,4 @@ public class PortalSpawnEventTest
             event.setCanceled(true);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -40,9 +41,11 @@ import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.function.Function;
 
+*/
 /**
  * Test for {@link TextureStitchEvent.Pre}.
- */
+ *//*
+
 //@Mod(modid = CustomTextureAtlasSpriteTest.MOD_ID, name = CustomTextureAtlasSpriteTest.NAME, version = "1.0", clientSideOnly = true)
 public class CustomTextureAtlasSpriteTest
 {
@@ -124,3 +127,4 @@ public class CustomTextureAtlasSpriteTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -27,9 +28,11 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.event.FMLInitializationEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 
+*/
 /**
  * Simple mod to test fov modifier.
- */
+ *//*
+
 //@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true)
 public class FOVModifierEventTest
 {
@@ -53,3 +56,4 @@ public class FOVModifierEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -60,3 +61,4 @@ public class SearchableCreativeTabTest
         }
     };
 }
+*/

src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -58,3 +59,4 @@ public class ContainerDrawForegroundEventTest
     }
 
 }
+*/

src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -53,4 +54,4 @@ public class TooltipColorEventTest
             event.setBorderEnd(0xF03f0f0f);
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -178,7 +179,8 @@ public class AnimatedModelTest
                     return state.withProperty(Properties.StaticProperty, true);
                 }
 
-                /*@Override
+                */
+/*@Override
                 public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
                     TileEntity te = world.getTileEntity(pos);
                     if(te instanceof Chest && state instanceof IExtendedBlockState)
@@ -186,7 +188,8 @@ public class AnimatedModelTest
                         return ((Chest)te).getState((IExtendedBlockState)state);
                     }
                     return super.getExtendedState(state, world, pos);
-                }*/
+                }*//*
+
 
                 @Override
                 public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
@@ -315,7 +318,8 @@ public class AnimatedModelTest
                 @SuppressWarnings("deprecation")
                 public Render<EntityChest> createRenderFor(RenderManager manager)
                 {
-                /*model = ModelLoaderRegistry.getModel(new ResourceLocation(ModelLoaderRegistryTest.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"));
@@ -323,7 +327,8 @@ public class AnimatedModelTest
                 if(model instanceof IModelCustomData)
                 {
                     model = ((IModelCustomData)model).process(ImmutableMap.of("mesh", "[\"Base\", \"Lid\"]"));
-                }*/
+                }*//*
+
                     ResourceLocation location = new ModelResourceLocation(new ResourceLocation(MODID, blockName), "entity");
                     return new RenderLiving<EntityChest>(manager, new net.minecraftforge.client.model.animation.AnimationModelBase<EntityChest>(location, new VertexLighterSmoothAo(Minecraft.getMinecraft().getBlockColors()))
                     {
@@ -420,9 +425,11 @@ public class AnimatedModelTest
 
         public Chest()
         {
-            /*asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/chest.json"), ImmutableMap.<String, ITimeValue>of(
+            */
+/*asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/chest.json"), ImmutableMap.<String, ITimeValue>of(
                 "click_time", clickTime
-            ));*/
+            ));*//*
+
             asm = proxy.load(new ResourceLocation(MODID.toLowerCase(), "asms/block/engine.json"), ImmutableMap.<String, ITimeValue>of(
                     "cycle_length", cycleLength,
                     "click_time", clickTime
@@ -444,9 +451,11 @@ public class AnimatedModelTest
             return true;
         }
 
-        /*public IExtendedBlockState getState(IExtendedBlockState state) {
+        */
+/*public IExtendedBlockState getState(IExtendedBlockState state) {
             return state.withProperty(B3DFrameProperty.instance, curState);
-        }*/
+        }*//*
+
 
         public void click(boolean sneaking)
         {
@@ -456,7 +465,8 @@ public class AnimatedModelTest
                 {
                     cycleLength.setValue(6 - cycleLength.apply(0));
                 }
-                /*else if(asm.currentState().equals("closed"))
+                */
+/*else if(asm.currentState().equals("closed"))
                 {
                     clickTime.setValue(Animation.getWorldTime(getWorld()));
                     asm.transition("opening");
@@ -465,7 +475,8 @@ public class AnimatedModelTest
                 {
                     clickTime.setValue(Animation.getWorldTime(getWorld()));
                     asm.transition("closing");
-                }*/
+                }*//*
+
                 else if (asm.currentState().equals("default"))
                 {
                     float time = Animation.getWorldTime(getWorld(), Animation.getPartialTickTime());
@@ -563,3 +574,4 @@ public class AnimatedModelTest
     }
 }
 
+*/

src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -116,7 +117,8 @@ public class ForgeBlockStatesLoaderTest
 
     // this block is never actually used, it's only needed for the error message on load to see the variant it maps to
     // disabling until we can make it a proper test
-    /*public static class CustomMappedBlock extends Block
+    */
+/*public static class CustomMappedBlock extends Block
     {
         public static final PropertyEnum<CustomVariant> VARIANT = PropertyEnum.create("type", CustomVariant.class);
 
@@ -152,5 +154,7 @@ public class ForgeBlockStatesLoaderTest
 
             public String getName() { return this.toString(); };
         }
-    }*/
+    }*//*
+
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -118,3 +119,4 @@ public class ItemLayerModelTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -80,3 +81,4 @@ public class ItemModelConflictTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -97,3 +98,4 @@ public class ItemModelGenerationTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -388,3 +389,4 @@ public class ModelBakeEventTest
         throw new IllegalArgumentException("Unknown Side " + side);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ModelDataTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -187,3 +188,4 @@ public class ModelDataTest
         event.getRegistry().register(TileEntityType.Builder.func_223042_a(Tile::new, MY_BLOCK).build(null).setRegistryName(MODID, BLOCK_NAME));
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -217,3 +218,4 @@ public class ModelFluidTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -228,6 +229,7 @@ public class ModelLoaderRegistryTest
             return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite());
         }
 
+*/
 /*        @Override
         public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
         {
@@ -235,7 +237,8 @@ public class ModelLoaderRegistryTest
             B3DLoader.B3DState newState = new B3DLoader.B3DState(null, counter);
             return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, newState);
         }
-*/
+*//*
+
         @Override
         public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
         {
@@ -263,7 +266,8 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block is intended to demonstrate how to change the visibility of a group(s)
      * from within the block's class.
      * By right clicking on this block the player increments an integer value in the tile entity
@@ -273,7 +277,8 @@ public class ModelLoaderRegistryTest
      * Holding shift decrements the value in the tile entity.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJTesseractBlock extends Block
     {
         public static final String name = "obj_tesseract_block";
@@ -342,6 +347,7 @@ public class ModelLoaderRegistryTest
             return true;
         }
 
+*/
 /*        @Override
         public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
         {
@@ -351,7 +357,8 @@ public class ModelLoaderRegistryTest
                 return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, te.state);
             }
             return state;
-        }*/
+        }*//*
+
     }
 
     public static class OBJTesseractTileEntity extends TileEntity
@@ -427,7 +434,8 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block demonstrates how to utilize the vertex coloring feature
      * of the OBJ loader. See 'vertex_coloring.obj' and 'vertex_coloring.mtl' in
      * 'test/resources/assets/forgedebugmodelloaderregistry/models/block/', to properly
@@ -436,7 +444,8 @@ public class ModelLoaderRegistryTest
      * color instead of each vertex.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJVertexColoring1 extends Block
     {
         public static final String name = "obj_vertex_coloring1";
@@ -466,14 +475,16 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block demonstrates how to use IProperties and IUnlistedProperties together
      * in the same ExtendedBlockState. Similar to pistons, this block will face the player
      * when placed. Unlike pistons, however; this block's model is an eyeball, because
      * the OBJ loader can load spheres.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJDirectionEye extends Block
     {
         public static final DirectionProperty FACING = BlockStateProperties.FACING;
@@ -517,13 +528,15 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block uses the same model as CustomModelBlock3 does, but
      * this class allows the player to cycle the colors of each vertex to black
      * and then back to the original color when right clicking on the block.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJVertexColoring2 extends Block
     {
         public static final String name = "obj_vertex_coloring2";
@@ -576,7 +589,8 @@ public class ModelLoaderRegistryTest
             if (this.world.isRemote)
             {
                 logger.info(shouldIncrement);
-                /*
+                */
+/*
                 IBakedModel bakedModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(this.world.getBlockState(this.pos), this.world, this.pos);
                 if (bakedModel != null && bakedModel instanceof OBJBakedModel)
                 {
@@ -621,16 +635,19 @@ public class ModelLoaderRegistryTest
                         }
                     }
                     this.world.markBlockRangeForRenderUpdate(this.pos, this.pos);
-                }*/
+                }*//*
+
             }
         }
     }
 
-    /**
+    */
+/**
      * This block is a debug block that faces the player when placed, like a piston.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJDirectionBlock extends Block
     {
         public static final DirectionProperty FACING = BlockStateProperties.FACING;
@@ -674,12 +691,14 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block is a testing block that will be used to test the use
      * of "custom" data defined in a forge blockstate json. WIP, ignore for now.
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJCustomDataBlock extends Block
     {
         public static final BooleanProperty NORTH = BooleanProperty.create("north");
@@ -726,12 +745,14 @@ public class ModelLoaderRegistryTest
         }
     }
 
-    /**
+    */
+/**
      * This block uses the same model as CustomModelBlock4, but instead of facing the
      * player when placed, this one ALWAYS faces the player. I know, creepy right?
      * @author shadekiller666
      *
-     */
+     *//*
+
     public static class OBJDynamicEye extends Block
     {
         public static final String name = "obj_dynamic_eye";
@@ -766,6 +787,7 @@ public class ModelLoaderRegistryTest
             return true;
         }
 
+*/
 /*        @Override
         public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
         {
@@ -778,7 +800,8 @@ public class ModelLoaderRegistryTest
                 }
             }
             return state;
-        }*/
+        }*//*
+
     }
 
     public static class OBJDynamicEyeTileEntity extends TileEntity implements ITickable
@@ -822,3 +845,4 @@ public class ModelLoaderRegistryTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -100,3 +101,4 @@ public class MultiLayerModelTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -265,3 +266,4 @@ public class FastTESRTransparentTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -161,3 +162,4 @@ public class ItemTESRTest
     {
     }
 }
+*/

src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -112,3 +113,4 @@ public class VertexBufferNormalTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -70,3 +71,4 @@ public class BlockEntityUpdateTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -53,3 +54,4 @@ public class EntityTravelToDimensionEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -117,4 +118,4 @@ public class GetCollisionBoxesEventTest
         }
 
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -49,3 +50,4 @@ public class ProjectileImpactEventTest
         logger.info("projectile: {}, impact: {}", event.getEntity().getName(), event.getRayTraceResult());
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -45,3 +46,4 @@ public class AnimalTameEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -50,3 +51,4 @@ public class AttackEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -47,3 +48,4 @@ public class BabyEntitySpawnEventTest
         event.setChild(new EntityCow(event.getParentA().world));
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -48,3 +49,4 @@ public class CheckSpawnEventTest
     	event.setResult(Result.DENY);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -44,3 +45,4 @@ public class CustomSpawnPlacementTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -169,3 +170,4 @@ public class DamageEventTest
 
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -42,10 +43,12 @@ public class EquipmentChangeEventTest
         }
     }
 
-    /**
+    */
+/**
      * the Method handling the {@link LivingEquipmentChangeEvent}
      * Serverside only!
-     */
+     *//*
+
     @SubscribeEvent
     public void onEquipmentChange(LivingEquipmentChangeEvent event)
     {
@@ -54,3 +57,4 @@ public class EquipmentChangeEventTest
     }
 
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -46,4 +47,4 @@ public class KnockBackEventTest
             }
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -49,3 +50,4 @@ public class MobGriefingEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -44,4 +45,4 @@ public class SpecialSpawnTest
             event.getEntity().setCustomNameTag("Called SpecialSpawn");
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -38,3 +39,4 @@ public class VillagerProfessionTest
         event.getRegistry().register(profession);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -86,3 +87,4 @@ public class CriticalHitEventTest
         log.info("The damagemodifier is changed to {}", event.getDamageModifier());
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -63,4 +64,4 @@ public class DamageReworkTest
             }
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -54,3 +55,4 @@ public class ItemPickupEventTest
     	logger.info("Item picked up: " + event.getStack().getDisplayName() + "x" + event.getStack().getCount());
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -248,3 +249,4 @@ public class PlayerInteractEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -50,3 +51,4 @@ public class PlayerSetSpawnTest
         event.setCanceled(true);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -78,3 +79,4 @@ public class ReachDistanceAttributeTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -78,3 +79,4 @@ public class SwimSpeedAttributeTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -73,3 +74,4 @@ public class ColoredFluidTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -55,3 +56,4 @@ public class CreateFluidSourceEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -380,3 +381,4 @@ public class DynBucketTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -29,13 +30,15 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+*/
 /**
  * This test will:
  *  - Cause lava to turn into gold when touched by water.
  *  - Replace the result of a cobblestone generator with granite.
  *  - Replace the result of a stone generator with either diamond, or emerald when in a biome where emerald spawns naturally.
  *  - Prevent lava from setting surrounding blocks on fire.
- */
+ *//*
+
 //@Mod(modid = "fluidplaceblocktest", name = "FluidPlaceBlockTest", version = "0.0.0", acceptableRemoteVersions = "*")
 public class FluidPlaceBlockEventTest
 {
@@ -62,3 +65,4 @@ public class FluidPlaceBlockEventTest
         if (event.getState().getBlock() == Blocks.FIRE) event.setNewState(event.getOriginalState());
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -318,3 +319,4 @@ public class FluidPlacementTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -159,3 +160,4 @@ public class ItemFluidHandlerTest
         return list;
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -86,3 +87,4 @@ public class AnytimeSleepingTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -74,3 +75,4 @@ public class BrewingRecipeRegistryTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -60,3 +61,4 @@ public class ConstantLoadingTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -77,3 +78,4 @@ public class CraftingSystemTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -48,4 +49,4 @@ public class DifficultyChangeEventTest
     {
         logger.info("Difficulty changed from {} to {}", event.getOldDifficulty(), event.getDifficulty());
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -182,3 +183,4 @@ public class DynamicBannerTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -51,3 +52,4 @@ public class EnchantmentLevelSetEventTest
         event.setLevel(30 - event.getLevel());
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -128,3 +129,4 @@ public class FurnaceFuelBurnTimeEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -29,12 +30,14 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.items.ItemHandlerHelper;
 
+*/
 /**
  * A mod to test that ItemHandlerHelper.giveItemToPlayer works.
  * More specifically, that all players, including the one receiving the item, can hear the pickup sound when it happens.
  * This mod makes it so when you right click the air with a piece of dirt in your hand, you get another piece of dirt.
  * It's not a dupe glitch...it's a dupe "feature"...
- */
+ *//*
+
 //@Mod(modid = "giveitemtoplayertest", name = "ItemHandlerHelper.giveItemToPlayer Test", version = "1.0")
 public class GiveItemToPlayerTest {
     private static final boolean ENABLED = false;
@@ -58,3 +61,4 @@ public class GiveItemToPlayerTest {
         event.setCancellationResult(EnumActionResult.SUCCESS);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -64,3 +65,4 @@ public class InputUpdateEventTest
     }
 
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -223,3 +224,4 @@ public class NoBedSleepingTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -125,3 +126,4 @@ public class PotionRegistryTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -118,3 +119,4 @@ public class RecipeMatchingTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -49,3 +50,4 @@ public class AdvancementCriterionTest {
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -53,3 +54,4 @@ public class AdvancementEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -42,10 +43,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+*/
 /**
  * Most of the real work is in the advancements directory of this mod.
  * This mod tests ore-dict advancement triggers.
- */
+ *//*
+
 //@Mod.EventBusSubscriber
 //@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*")
 public class OredictTriggerTest
@@ -59,7 +62,9 @@ public class OredictTriggerTest
     {
         try
         {
-            final Method tmp = CriteriaTriggers.class.getDeclaredMethod("register"/* func_192118_a */, ICriterionTrigger.class);
+            final Method tmp = CriteriaTriggers.class.getDeclaredMethod("register"*/
+/* func_192118_a *//*
+, ICriterionTrigger.class);
             tmp.setAccessible(true);
             ctRegister = MethodHandles.lookup().unreflect(tmp);
         }
@@ -94,9 +99,11 @@ public class OredictTriggerTest
     }
 
 
-    /**
+    */
+/**
      * Far more work than expected…oh well.
-     */
+     *//*
+
     public static class EnabledTrigger implements ICriterionTrigger<EnabledTrigger.Instance>
     {
         public static final ResourceLocation ID = new ResourceLocation(MODID, "is_enabled");
@@ -215,3 +222,4 @@ public class OredictTriggerTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -122,3 +123,4 @@ public class LootContextTweaksTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -55,3 +56,4 @@ public class LootTableLoadEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -75,3 +76,4 @@ public class LootTableTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -69,3 +70,4 @@ public class BonemealEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -86,3 +87,4 @@ public class CanApplyAtEnchantingTableTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -59,3 +60,4 @@ public class CanDestroyBlocksInCreativeTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -131,3 +132,4 @@ public class ContinuousUseItemTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -96,3 +97,4 @@ public class HorseArmorTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -97,3 +98,4 @@ public class IsBookEnchantableTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -63,3 +64,4 @@ public class ItemFishedEventTest
         event.damageRodBy(50);
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/MapDataTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -272,3 +273,4 @@ public class MapDataTest
     }
 
 }
+*/

src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -92,4 +93,4 @@ public class MendingRepairTest
             return 0.1f;
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -127,3 +128,4 @@ public class NBTShareTagTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -114,4 +115,4 @@ public class OnItemUseFirstTest
             return "OnItemUseFirst Returns: " + EnumActionResult.values()[stack.getMetadata()];
         }
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -39,13 +40,15 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+*/
 /**
  * Usage (use survival so you can eat food):
  * 1. Drink curable_potion from Brewing creative tab
  * 2. Relog to test that changes to curative items persist, then eat the "medicine" item to cure the effect
  * 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 = PotionCurabilityTest.MODID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*")
 public class PotionCurabilityTest
 {
@@ -135,3 +138,4 @@ public class PotionCurabilityTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -53,3 +54,4 @@ public class PotionShouldRenderTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/item/ShieldTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -102,4 +103,4 @@ public class ShieldTest
         ModelLoader.setCustomModelResourceLocation(DIAMOND_SHIELD, 0, new ModelResourceLocation("shield_test:diamond_shield", "inventory"));
         ModelLoader.setCustomModelResourceLocation(HEAVY_DIAMOND_SWORD, 0, new ModelResourceLocation("minecraft:diamond_sword", "inventory"));
     }
-}
+}*/

src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -59,3 +60,4 @@ public class EnumPlantTypeTest
         });
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -320,3 +321,4 @@ public class CapabilityTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -107,3 +108,4 @@ public class ClientLoadingExceptionTest
         };
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -226,3 +227,4 @@ public class ConfigAnnotationTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -151,3 +152,4 @@ public class ObjectHolderAnnotationTest
         public static final ICustomRegistryEntry custom_entry_by_interface = null;
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/PermissionTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -194,3 +195,4 @@ public class PermissionTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -123,3 +124,4 @@ public class RegistryOverrideTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -83,3 +84,4 @@ public class BigNetworkMessageTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -139,3 +140,4 @@ public class TrackingTargetTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -63,3 +64,4 @@ public class ModNameTooltip
         return null;
     }
 }
+*/

src/test/java/net/minecraftforge/debug/util/RotatingWrench.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -101,3 +102,4 @@ public class RotatingWrench
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/util/TextureDumper.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -99,3 +100,4 @@ public class TextureDumper
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/village/MerchantTradeOffersEventTest.java

@@ -15,7 +15,8 @@
  * 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.village;
 
@@ -29,10 +30,12 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+*/
 /**
  * Tests {@link MerchantTradeOffersEvent}. When enabled, the item that the villager sells to
  * the player will be maxed out in stack size.
- */
+ *//*
+
 //@Mod(modid = MerchantTradeOffersEventTest.MODID, name = MerchantTradeOffersEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*")
 public class MerchantTradeOffersEventTest
 {
@@ -64,3 +67,4 @@ public class MerchantTradeOffersEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/village/VillageSiegeEventTest.java

@@ -15,7 +15,8 @@
  * 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.village;
 
@@ -31,10 +32,12 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+*/
 /**
  * Tests {@link VillageSiegeEvent}. When enabled, players holding a diamond sword in the mainhand
  * slot are not counted in determining where the zombie siege occurs.
- */
+ *//*
+
 //@Mod(modid = VillageSiegeEventTest.MODID, name = VillageSiegeEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*")
 public class VillageSiegeEventTest
 {
@@ -63,3 +66,4 @@ public class VillageSiegeEventTest
         }
     }
 }
+*/

src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -43,10 +44,12 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 import javax.annotation.Nonnull;
 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 = ChunkCapabilityTest.MODID, name = "Chunk Capability Test", version = "0.0.0", acceptableRemoteVersions = "*")
 public class ChunkCapabilityTest
 {
@@ -93,10 +96,12 @@ public class ChunkCapabilityTest
         }
     }
 
-    /**
+    */
+/**
      * Marks the chunk as dirty when the value changes.
      * Cannot be the default implementation because it requires a chunk in the constructor
-     */
+     *//*
+
     public static class SafePollution extends DefaultPollution
     {
         private final Chunk chunk;
@@ -195,3 +200,4 @@ public class ChunkCapabilityTest
     }
 
 }
+*/

src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java

@@ -15,7 +15,8 @@
  * 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;
 
@@ -58,3 +59,4 @@ public class ChunkWatchEventTest
         logger.info("Watching chunk {} in dimension {}. Player's dimension: {} ", event.getChunk(), event.getChunkInstance().getWorld().provider.getDimension(), event.getPlayer().getEntityWorld().provider.getDimension());
     }
 }
+*/