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

Comment out test Mod/EventBusSubscriber annotations, fix up ModelLoaderRegistryTest

This commit is contained in:
tterrag 2019-03-22 20:33:18 -04:00
parent de14670d4d
commit e482793f69
125 changed files with 369 additions and 583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/net/minecraftforge/debug/PotionEventTest.java
View File

@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "potioneventtest", name = "PotionEventTest", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "potioneventtest", name = "PotionEventTest", version = "1.0.0", acceptableRemoteVersions = "*")
public class PotionEventTest public class PotionEventTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/block/BasePlaceEventTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = BasePlaceEventTest.MOD_ID, name = "BaseBlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = BasePlaceEventTest.MOD_ID, name = "BaseBlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class BasePlaceEventTest public class BasePlaceEventTest
{ {
static final String MOD_ID = "base_block_place_event_test"; static final String MOD_ID = "base_block_place_event_test";

4
src/test/java/net/minecraftforge/debug/block/FarmlandTrampleEventTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = FarmlandTrampleEventTest.MOD_ID, name = "Farmland Trample Event Test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = FarmlandTrampleEventTest.MOD_ID, name = "Farmland Trample Event Test", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class FarmlandTrampleEventTest public class FarmlandTrampleEventTest
{ {
static final String MOD_ID = "farmland_trample_test"; static final String MOD_ID = "farmland_trample_test";

2
src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java
View File

@ -47,7 +47,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@Mod(modid = FarmlandWaterTest.ID, name = "Farmland Water Test", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = FarmlandWaterTest.ID, name = "Farmland Water Test", version = "1.0.0", acceptableRemoteVersions = "*")
public class FarmlandWaterTest public class FarmlandWaterTest
{ {
//This adds a block that creates a 4x4x4 watered region when activated //This adds a block that creates a 4x4x4 watered region when activated

6
src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java
View File

@ -48,8 +48,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@EventBusSubscriber //@EventBusSubscriber
@Mod(modid = MaterialFogColorTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = MaterialFogColorTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*")
public class MaterialFogColorTest public class MaterialFogColorTest
{ {
static final boolean ENABLED = false; // <-- enable mod static final boolean ENABLED = false; // <-- enable mod
@ -122,7 +122,7 @@ public class MaterialFogColorTest
} }
} }
@EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "neighbornotifyeventtest", name = "NeighborNotifyEventTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "neighbornotifyeventtest", name = "NeighborNotifyEventTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class NeighborNotifyEventTest public class NeighborNotifyEventTest
{ {

6
src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java
View File

@ -50,8 +50,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_ID; import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_ID;
import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_NAME; import static net.minecraftforge.debug.block.ParticleEffectsTest.MOD_NAME;
@EventBusSubscriber //@EventBusSubscriber
@Mod (modid = MOD_ID, name = MOD_NAME, version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = MOD_ID, name = MOD_NAME, version = "1.0", acceptableRemoteVersions = "*")
public class ParticleEffectsTest public class ParticleEffectsTest
{ {
@ -117,7 +117,7 @@ public class ParticleEffectsTest
event.getRegistry().register(item.setRegistryName(particleBlockLocation)); event.getRegistry().register(item.setRegistryName(particleBlockLocation));
} }
@EventBusSubscriber (value = Side.CLIENT, modid = MOD_ID) //@EventBusSubscriber (value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler public static class ClientEventHandler
{ {

6
src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java
View File

@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Mod;
import java.util.Collections; import java.util.Collections;
@Mod(modid = PathNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = PathNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class PathNodeTypeTest public class PathNodeTypeTest
{ {
static final String MOD_ID = "ai_node_type_test"; static final String MOD_ID = "ai_node_type_test";
@ -53,7 +53,7 @@ public class PathNodeTypeTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

4
src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = PlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = PlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class PlaceEventTest public class PlaceEventTest
{ {
static final String MOD_ID = "block_place_event_test"; static final String MOD_ID = "block_place_event_test";

4
src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java
View File

@ -25,8 +25,8 @@ import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = PortalSpawnEventTest.MOD_ID, name = "PortalSpawnEvent test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = PortalSpawnEventTest.MOD_ID, name = "PortalSpawnEvent test mod", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class PortalSpawnEventTest public class PortalSpawnEventTest
{ {
static final String MOD_ID = "portal_spawn_event_test"; static final String MOD_ID = "portal_spawn_event_test";

6
src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java
View File

@ -40,8 +40,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.util.Collections; import java.util.Collections;
@Mod(modid = SlipperinessTest.MOD_ID, name = "Slipperiness Test", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = SlipperinessTest.MOD_ID, name = "Slipperiness Test", version = "0.0.0", acceptableRemoteVersions = "*")
@EventBusSubscriber //@EventBusSubscriber
public class SlipperinessTest public class SlipperinessTest
{ {
static final String MOD_ID = "slipperiness_test"; static final String MOD_ID = "slipperiness_test";
@ -70,7 +70,7 @@ public class SlipperinessTest
e.getRegistry().register(new ItemBlock(BB_BLOCK).setRegistryName(BB_BLOCK.getRegistryName())); e.getRegistry().register(new ItemBlock(BB_BLOCK).setRegistryName(BB_BLOCK.getRegistryName()));
} }
@EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) //@EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

4
src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java
View File

@ -42,7 +42,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@Mod(modid = StickyBlockTest.MODID, name = "ForgeDebugCustomSlimeBlock", version = StickyBlockTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = StickyBlockTest.MODID, name = "ForgeDebugCustomSlimeBlock", version = StickyBlockTest.VERSION, acceptableRemoteVersions = "*")
public class StickyBlockTest public class StickyBlockTest
{ {
public static final String MODID = "forgedebugcustomslimeblock"; public static final String MODID = "forgedebugcustomslimeblock";
@ -58,7 +58,7 @@ public class StickyBlockTest
ForgeRegistries.ITEMS.register(new ItemMultiTexture(CUSTOM_SLIME_BLOCK, CUSTOM_SLIME_BLOCK, stack -> CustomSlime.BlockType.values[stack.getMetadata()].toString()).setRegistryName(CUSTOM_SLIME_BLOCK.getRegistryName())); ForgeRegistries.ITEMS.register(new ItemMultiTexture(CUSTOM_SLIME_BLOCK, CUSTOM_SLIME_BLOCK, stack -> CustomSlime.BlockType.values[stack.getMetadata()].toString()).setRegistryName(CUSTOM_SLIME_BLOCK.getRegistryName()));
} }
@EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class BakeEventHandler public static class BakeEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

2
src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = "clientchateventtest", name = "Client Chat Event Test", version = "0.0.0", clientSideOnly = true) //@Mod(modid = "clientchateventtest", name = "Client Chat Event Test", version = "0.0.0", clientSideOnly = true)
public class ClientChatEventTest public class ClientChatEventTest
{ {
static final boolean ENABLED = false; static final boolean ENABLED = false;

2
src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java
View File

@ -37,7 +37,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true) //@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true)
public class ClientCommandTest public class ClientCommandTest
{ {
@EventHandler @EventHandler

2
src/test/java/net/minecraftforge/debug/chat/CommandEventTest.java
View File

@ -34,7 +34,7 @@ import org.apache.logging.log4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Mod("command_event_test") //@Mod("command_event_test")
public class CommandEventTest public class CommandEventTest
{ {
public final Logger LOGGER = LogManager.getLogger(); public final Logger LOGGER = LogManager.getLogger();

2
src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.fml.event.FMLServerStartingEvent;
import net.minecraftforge.server.command.CommandTreeBase; import net.minecraftforge.server.command.CommandTreeBase;
@Mod(modid = CommandTreeBaseTest.MOD_ID, name = "CommandTreeBaseTest", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = CommandTreeBaseTest.MOD_ID, name = "CommandTreeBaseTest", version = "1.0.0", acceptableRemoteVersions = "*")
public class CommandTreeBaseTest public class CommandTreeBaseTest
{ {
public static final String MOD_ID = "command_tree_base_test"; public static final String MOD_ID = "command_tree_base_test";

2
src/test/java/net/minecraftforge/debug/chat/EntitySelectorTest.java
View File

@ -34,7 +34,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
@Mod("entity_selector_test") //@Mod("entity_selector_test")
public class EntitySelectorTest public class EntitySelectorTest
{ {
public EntitySelectorTest() public EntitySelectorTest()

4
src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java
View File

@ -43,7 +43,7 @@ import java.util.function.Function;
/** /**
* Test for {@link TextureStitchEvent.Pre}. * Test for {@link TextureStitchEvent.Pre}.
*/ */
@Mod(modid = CustomTextureAtlasSpriteTest.MOD_ID, name = CustomTextureAtlasSpriteTest.NAME, version = "1.0", clientSideOnly = true) //@Mod(modid = CustomTextureAtlasSpriteTest.MOD_ID, name = CustomTextureAtlasSpriteTest.NAME, version = "1.0", clientSideOnly = true)
public class CustomTextureAtlasSpriteTest public class CustomTextureAtlasSpriteTest
{ {
static final String MOD_ID = "custom_sprite_test"; static final String MOD_ID = "custom_sprite_test";
@ -51,7 +51,7 @@ public class CustomTextureAtlasSpriteTest
private static Logger logger; private static Logger logger;
@Mod.EventBusSubscriber(modid = MOD_ID) //@Mod.EventBusSubscriber(modid = MOD_ID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

2
src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java
View File

@ -30,7 +30,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
/** /**
* Simple mod to test fov modifier. * Simple mod to test fov modifier.
*/ */
@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true) //@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true)
public class FOVModifierEventTest public class FOVModifierEventTest
{ {
static final boolean ENABLED = false; static final boolean ENABLED = false;

2
src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@Mod(modid = SearchableCreativeTabTest.MODID, name = "Debug Search Tab", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = SearchableCreativeTabTest.MODID, name = "Debug Search Tab", version = "1.0", acceptableRemoteVersions = "*")
public class SearchableCreativeTabTest public class SearchableCreativeTabTest
{ {
public static final String MODID = "debugsearchtab"; public static final String MODID = "debugsearchtab";

4
src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java
View File

@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@EventBusSubscriber(Side.CLIENT) //@EventBusSubscriber(Side.CLIENT)
@Mod (modid = "guicontainereventtest", name = "GuiContainer Event Tests!", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "guicontainereventtest", name = "GuiContainer Event Tests!", version = "1.0", acceptableRemoteVersions = "*")
public class ContainerDrawForegroundEventTest public class ContainerDrawForegroundEventTest
{ {
static final boolean ENABLED = false; static final boolean ENABLED = false;

2
src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@Mod(modid = TooltipColorEventTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true) //@Mod(modid = TooltipColorEventTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true)
public class TooltipColorEventTest public class TooltipColorEventTest
{ {
public static final String MODID = "tooltipcolortest"; public static final String MODID = "tooltipcolortest";

6
src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java
View File

@ -81,7 +81,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@Mod(modid = AnimatedModelTest.MODID, name = "ForgeDebugModelAnimation", version = AnimatedModelTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = AnimatedModelTest.MODID, name = "ForgeDebugModelAnimation", version = AnimatedModelTest.VERSION, acceptableRemoteVersions = "*")
public class AnimatedModelTest public class AnimatedModelTest
{ {
public static final String MODID = "forgedebugmodelanimation"; public static final String MODID = "forgedebugmodelanimation";
@ -107,7 +107,7 @@ public class AnimatedModelTest
private static Logger logger; private static Logger logger;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent
@ -283,7 +283,7 @@ public class AnimatedModelTest
public static class ServerProxy extends CommonProxy {} public static class ServerProxy extends CommonProxy {}
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientProxy extends CommonProxy public static class ClientProxy extends CommonProxy
{ {

4
src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java
View File

@ -35,7 +35,7 @@ import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@Mod(modid = BlockstateRetextureTest.MODID, name = "BlockstateRetextureTest", version = BlockstateRetextureTest.VERSION, acceptableRemoteVersions = "*", clientSideOnly = true) //@Mod(modid = BlockstateRetextureTest.MODID, name = "BlockstateRetextureTest", version = BlockstateRetextureTest.VERSION, acceptableRemoteVersions = "*", clientSideOnly = true)
public class BlockstateRetextureTest public class BlockstateRetextureTest
{ {
public static final String MODID = "forge_blockstate_retexture_test"; public static final String MODID = "forge_blockstate_retexture_test";
@ -53,7 +53,7 @@ public class BlockstateRetextureTest
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
}; };
@Mod.EventBusSubscriber(modid = MODID, value = Side.CLIENT) //@Mod.EventBusSubscriber(modid = MODID, value = Side.CLIENT)
public static class ClientEvents public static class ClientEvents
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java
View File

@ -40,8 +40,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@Mod(modid = ForgeBlockStatesLoaderTest.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ForgeBlockStatesLoaderTest.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class ForgeBlockStatesLoaderTest public class ForgeBlockStatesLoaderTest
{ {
public static final String MODID = "forgeblockstatesloader"; public static final String MODID = "forgeblockstatesloader";
@ -82,7 +82,7 @@ public class ForgeBlockStatesLoaderTest
//public static final Block blockCustom = new CustomMappedBlock(); //public static final Block blockCustom = new CustomMappedBlock();
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

4
src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java
View File

@ -40,7 +40,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Random; import java.util.Random;
@Mod(modid = ItemLayerModelTest.MODID, name = "ForgeDebugItemLayerModel", version = ItemLayerModelTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = ItemLayerModelTest.MODID, name = "ForgeDebugItemLayerModel", version = ItemLayerModelTest.VERSION, acceptableRemoteVersions = "*")
public class ItemLayerModelTest public class ItemLayerModelTest
{ {
public static final String MODID = "forgedebugitemlayermodel"; public static final String MODID = "forgedebugitemlayermodel";
@ -48,7 +48,7 @@ public class ItemLayerModelTest
@ObjectHolder("test_item") @ObjectHolder("test_item")
public static final Item TEST_ITEM = null; public static final Item TEST_ITEM = null;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java
View File

@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
@Mod(modid = ItemModelConflictTest.MODID, name = "Test mod for model conflicts", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ItemModelConflictTest.MODID, name = "Test mod for model conflicts", version = "1.0", acceptableRemoteVersions = "*")
public class ItemModelConflictTest public class ItemModelConflictTest
{ {
public static final String MODID = "item_model_conflict_test"; public static final String MODID = "item_model_conflict_test";
@ -69,7 +69,7 @@ public class ItemModelConflictTest
); );
} }
@Mod.EventBusSubscriber(modid = MODID, value = Side.CLIENT) //@Mod.EventBusSubscriber(modid = MODID, value = Side.CLIENT)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java
View File

@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
@Mod(modid = ItemModelGenerationTest.MOD_ID, name = "Item model generation test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ItemModelGenerationTest.MOD_ID, name = "Item model generation test", version = "1.0", acceptableRemoteVersions = "*")
public class ItemModelGenerationTest public class ItemModelGenerationTest
{ {
static final String MOD_ID = "item_model_generation_test"; static final String MOD_ID = "item_model_generation_test";
@ -78,7 +78,7 @@ public class ItemModelGenerationTest
); );
} }
@Mod.EventBusSubscriber(modid = MOD_ID, value = Side.CLIENT) //@Mod.EventBusSubscriber(modid = MOD_ID, value = Side.CLIENT)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java
View File

@ -68,7 +68,7 @@ import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@Mod(modid = ModelBakeEventTest.MODID, name = "ForgeDebugModelBakeEvent", version = ModelBakeEventTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = ModelBakeEventTest.MODID, name = "ForgeDebugModelBakeEvent", version = ModelBakeEventTest.VERSION, acceptableRemoteVersions = "*")
public class ModelBakeEventTest public class ModelBakeEventTest
{ {
public static final String MODID = "forgedebugmodelbakeevent"; public static final String MODID = "forgedebugmodelbakeevent";
@ -95,7 +95,7 @@ public class ModelBakeEventTest
} }
} }
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent
@ -112,7 +112,7 @@ public class ModelBakeEventTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class BakeEventHandler public static class BakeEventHandler
{ {
@SubscribeEvent @SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java
View File

@ -41,7 +41,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = ModelFluidTest.MODID, name = "ForgeDebugModelFluid", version = ModelFluidTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = ModelFluidTest.MODID, name = "ForgeDebugModelFluid", version = ModelFluidTest.VERSION, acceptableRemoteVersions = "*")
public class ModelFluidTest public class ModelFluidTest
{ {
public static final String MODID = "forgedebugmodelfluid"; public static final String MODID = "forgedebugmodelfluid";
@ -70,7 +70,7 @@ public class ModelFluidTest
public static final Fluid GAS = new TestGas(); public static final Fluid GAS = new TestGas();
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent
@ -105,7 +105,7 @@ public class ModelFluidTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

430
src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java
View File

@ -19,66 +19,65 @@
package net.minecraftforge.debug.client.model; package net.minecraftforge.debug.client.model;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import com.google.common.collect.UnmodifiableIterator;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyBool;
import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.b3d.B3DLoader;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.common.model.IModelPart;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.Models;
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.common.property.Properties;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import org.apache.logging.log4j.Logger;
import javax.vecmath.AxisAngle4d; import javax.vecmath.AxisAngle4d;
import javax.vecmath.Matrix4f; import javax.vecmath.Matrix4f;
import javax.vecmath.Quat4f; import javax.vecmath.Quat4f;
import javax.vecmath.Vector3d; import javax.vecmath.Vector3d;
import javax.vecmath.Vector4f; import javax.vecmath.Vector4f;
import java.util.ArrayList;
import java.util.List;
@Mod(modid = ModelLoaderRegistryTest.MODID, name = "ForgeDebugModelLoaderRegistry", version = ModelLoaderRegistryTest.VERSION, acceptableRemoteVersions = "*") import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.common.collect.UnmodifiableIterator;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemGroup;
import net.minecraft.state.BooleanProperty;
import net.minecraft.state.DirectionProperty;
import net.minecraft.state.StateContainer;
import net.minecraft.state.StateContainer.Builder;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.b3d.B3DLoader;
import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.common.model.IModelPart;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.Models;
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ObjectHolder;
@Mod(ModelLoaderRegistryTest.MODID)
public class ModelLoaderRegistryTest public class ModelLoaderRegistryTest
{ {
public static final boolean ENABLED = false; public static final boolean ENABLED = true;
public static final String MODID = "forgedebugmodelloaderregistry"; public static final String MODID = "forgedebugmodelloaderregistry";
public static final String VERSION = "1.0"; public static final String VERSION = "1.0";
private static Logger logger; private static Logger logger;
@ -100,17 +99,27 @@ public class ModelLoaderRegistryTest
@ObjectHolder(OBJCustomDataBlock.name) @ObjectHolder(OBJCustomDataBlock.name)
public static final Block CUSTOM_DATA = null; public static final Block CUSTOM_DATA = null;
@EventHandler @ObjectHolder(OBJTesseractBlock.name)
public void preInit(FMLPreInitializationEvent event) public static final TileEntityType<OBJTesseractTileEntity> TESSERACT_TILE = null;
@ObjectHolder(OBJVertexColoring2.name)
public static final TileEntityType<OBJVertexColoring2TileEntity> VERTEX_COLOR_2_TILE = null;
public ModelLoaderRegistryTest()
{ {
if (!ENABLED) if (!ENABLED)
return; return;
logger = event.getModLog(); logger = LogManager.getLogger();
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setupClient);
} }
private void setupClient(FMLClientSetupEvent event)
{
B3DLoader.INSTANCE.addDomain(MODID);
OBJLoader.INSTANCE.addDomain(MODID);
}
@Mod.EventBusSubscriber(modid = MODID) @Mod.EventBusSubscriber(modid = MODID, bus = Bus.MOD)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent
@ -128,8 +137,14 @@ public class ModelLoaderRegistryTest
//new OBJDynamicEye(), //new OBJDynamicEye(),
new OBJCustomDataBlock() new OBJCustomDataBlock()
); );
GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name); }
GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name);
@SubscribeEvent
public static void registerTileEntities(RegistryEvent.Register<TileEntityType<?>> event)
{
event.getRegistry().registerAll(
new TileEntityType<>(OBJTesseractTileEntity::new, null).setRegistryName(OBJTesseractBlock.name),
new TileEntityType<>(OBJVertexColoring2TileEntity::new, null).setRegistryName(OBJVertexColoring2.name));
//GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name); //GameRegistry.registerTileEntity(OBJDynamicEyeTileEntity.class, OBJDynamicEye.name);
} }
@ -149,7 +164,7 @@ public class ModelLoaderRegistryTest
CUSTOM_DATA CUSTOM_DATA
}; };
for (Block block : blocks) for (Block block : blocks)
event.getRegistry().register(new ItemBlock(block).setRegistryName(block.getRegistryName())); event.getRegistry().register(new ItemBlock(block, new Item.Properties().group(ItemGroup.BUILDING_BLOCKS)).setRegistryName(block.getRegistryName()));
} }
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent
@ -169,32 +184,22 @@ public class ModelLoaderRegistryTest
//DYNAMIC_EYE, //DYNAMIC_EYE,
CUSTOM_DATA CUSTOM_DATA
}; };
for (Block block : blocks)
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(block.getRegistryName(), "inventory"));
} }
} }
public static class CustomModelBlock extends Block public static class CustomModelBlock extends Block
{ {
public static final PropertyDirection FACING = PropertyDirection.create("facing"); public static final DirectionProperty FACING = BlockStateProperties.FACING;
public static final String name = "custom_model_block"; public static final String name = "custom_model_block";
private int counter = 1; private int counter = 1;
private CustomModelBlock() private CustomModelBlock()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override @Override
public boolean isFullCube(IBlockState state) public boolean isFullCube(IBlockState state)
{ {
@ -208,33 +213,21 @@ public class ModelLoaderRegistryTest
} }
@Override @Override
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) public IBlockState getStateForPlacement(BlockItemUseContext context)
{ {
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite());
} }
@Override /* @Override
public IBlockState getStateFromMeta(int meta)
{
return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta));
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(FACING).getIndex();
}
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{ {
//Only return an IExtendedBlockState from this method and createState(), otherwise block placement might break! //Only return an IExtendedBlockState from this method and createState(), otherwise block placement might break!
B3DLoader.B3DState newState = new B3DLoader.B3DState(null, counter); B3DLoader.B3DState newState = new B3DLoader.B3DState(null, counter);
return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, newState); return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, newState);
} }
*/
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{ {
if (world.isRemote) if (world.isRemote)
{ {
@ -254,29 +247,9 @@ public class ModelLoaderRegistryTest
} }
@Override @Override
public BlockStateContainer createBlockState() public void fillStateContainer(StateContainer.Builder<Block, IBlockState> builder)
{ {
return new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{Properties.AnimationProperty}); builder.add(FACING);
}
public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn)
{
if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F)
{
double d0 = entityIn.posY + (double) entityIn.getEyeHeight();
if (d0 - (double) clickedBlock.getY() > 2.0D)
{
return EnumFacing.UP;
}
if ((double) clickedBlock.getY() - d0 > 0.0D)
{
return EnumFacing.DOWN;
}
}
return entityIn.getHorizontalFacing().getOpposite();
} }
} }
@ -291,28 +264,26 @@ public class ModelLoaderRegistryTest
* @author shadekiller666 * @author shadekiller666
* *
*/ */
public static class OBJTesseractBlock extends Block implements ITileEntityProvider public static class OBJTesseractBlock extends Block
{ {
public static final String name = "obj_tesseract_block"; public static final String name = "obj_tesseract_block";
private OBJTesseractBlock() private OBJTesseractBlock()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) public boolean hasTileEntity()
{ {
return new OBJTesseractTileEntity(); return true;
} }
@Override @Override
public boolean isOpaqueCube(IBlockState state) public TileEntity createTileEntity(IBlockState state, IBlockReader world)
{ {
return false; return new OBJTesseractTileEntity();
} }
@Override @Override
@ -328,7 +299,7 @@ public class ModelLoaderRegistryTest
} }
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{ {
if (world.getTileEntity(pos) == null) if (world.getTileEntity(pos) == null)
{ {
@ -355,7 +326,7 @@ public class ModelLoaderRegistryTest
return true; return true;
} }
@Override /* @Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{ {
if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJTesseractTileEntity) if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJTesseractTileEntity)
@ -364,13 +335,7 @@ public class ModelLoaderRegistryTest
return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, te.state); return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, te.state);
} }
return state; return state;
} }*/
@Override
public BlockStateContainer createBlockState()
{
return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{Properties.AnimationProperty});
}
} }
public static class OBJTesseractTileEntity extends TileEntity public static class OBJTesseractTileEntity extends TileEntity
@ -403,6 +368,11 @@ public class ModelLoaderRegistryTest
} }
}; };
public OBJTesseractTileEntity()
{
super(TESSERACT_TILE);
}
public void increment() public void increment()
{ {
if (this.counter == max) if (this.counter == max)
@ -415,7 +385,7 @@ public class ModelLoaderRegistryTest
TextComponentString text = new TextComponentString("" + this.counter); TextComponentString text = new TextComponentString("" + this.counter);
if (this.world.isRemote) if (this.world.isRemote)
{ {
Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(text);
} }
} }
@ -431,7 +401,7 @@ public class ModelLoaderRegistryTest
TextComponentString text = new TextComponentString("" + this.counter); TextComponentString text = new TextComponentString("" + this.counter);
if (this.world.isRemote) if (this.world.isRemote)
{ {
Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text); Minecraft.getInstance().ingameGUI.getChatGUI().printChatMessage(text);
} }
} }
@ -457,18 +427,10 @@ public class ModelLoaderRegistryTest
private OBJVertexColoring1() private OBJVertexColoring1()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override @Override
public boolean isFullCube(IBlockState state) public boolean isFullCube(IBlockState state)
{ {
@ -492,46 +454,26 @@ public class ModelLoaderRegistryTest
*/ */
public static class OBJDirectionEye extends Block public static class OBJDirectionEye extends Block
{ {
public static final PropertyDirection FACING = PropertyDirection.create("facing"); public static final DirectionProperty FACING = BlockStateProperties.FACING;
public static final String name = "obj_direction_eye"; public static final String name = "obj_direction_eye";
private OBJDirectionEye() private OBJDirectionEye()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override @Override
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) public IBlockState getStateForPlacement(BlockItemUseContext context)
{ {
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite());
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) public void fillStateContainer(StateContainer.Builder<Block, IBlockState> builder)
{ {
return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); builder.add(FACING);
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(FACING).getIndex();
}
@Override
public BlockStateContainer createBlockState()
{
return new BlockStateContainer(this, FACING);
}
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
} }
@Override @Override
@ -545,26 +487,6 @@ public class ModelLoaderRegistryTest
{ {
return false; return false;
} }
public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn)
{
if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F)
{
double d0 = entityIn.posY + (double) entityIn.getEyeHeight();
if (d0 - (double) clickedBlock.getY() > 2.0D)
{
return EnumFacing.DOWN;
}
if ((double) clickedBlock.getY() - d0 > 0.0D)
{
return EnumFacing.UP;
}
}
return entityIn.getHorizontalFacing();
}
} }
/** /**
@ -574,26 +496,30 @@ public class ModelLoaderRegistryTest
* @author shadekiller666 * @author shadekiller666
* *
*/ */
public static class OBJVertexColoring2 extends Block implements ITileEntityProvider public static class OBJVertexColoring2 extends Block
{ {
public static final String name = "obj_vertex_coloring2"; public static final String name = "obj_vertex_coloring2";
private OBJVertexColoring2() private OBJVertexColoring2()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) public boolean hasTileEntity(IBlockState state)
{
return true;
}
@Override
public TileEntity createTileEntity(IBlockState state, IBlockReader world)
{ {
return new OBJVertexColoring2TileEntity(); return new OBJVertexColoring2TileEntity();
} }
@Override @Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{ {
if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJVertexColoring2TileEntity) if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJVertexColoring2TileEntity)
{ {
@ -614,6 +540,7 @@ public class ModelLoaderRegistryTest
public OBJVertexColoring2TileEntity() public OBJVertexColoring2TileEntity()
{ {
super(VERTEX_COLOR_2_TILE);
} }
public void cycleColors() public void cycleColors()
@ -678,24 +605,16 @@ public class ModelLoaderRegistryTest
*/ */
public static class OBJDirectionBlock extends Block public static class OBJDirectionBlock extends Block
{ {
public static final PropertyDirection FACING = PropertyDirection.create("facing"); public static final DirectionProperty FACING = BlockStateProperties.FACING;
public static final String name = "obj_direction_block"; public static final String name = "obj_direction_block";
private OBJDirectionBlock() private OBJDirectionBlock()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override @Override
public boolean isFullCube(IBlockState state) public boolean isFullCube(IBlockState state)
{ {
@ -709,47 +628,15 @@ public class ModelLoaderRegistryTest
} }
@Override @Override
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) public IBlockState getStateForPlacement(BlockItemUseContext context)
{ {
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer)); return this.getDefaultState().with(FACING, context.getPlacementHorizontalFacing().getOpposite());
} }
@Override @Override
public IBlockState getStateFromMeta(int meta) public void fillStateContainer(StateContainer.Builder<Block, IBlockState> builder)
{ {
return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); builder.add(FACING);
}
@Override
public int getMetaFromState(IBlockState state)
{
return state.getValue(FACING).getIndex();
}
@Override
public BlockStateContainer createBlockState()
{
return new BlockStateContainer(this, FACING);
}
public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn)
{
if (MathHelper.abs((float) entityIn.posX - (float) clickedBlock.getX()) < 2.0F && MathHelper.abs((float) entityIn.posZ - (float) clickedBlock.getZ()) < 2.0F)
{
double d0 = entityIn.posY + (double) entityIn.getEyeHeight();
if (d0 - (double) clickedBlock.getY() > 2.0D)
{
return EnumFacing.UP;
}
if ((double) clickedBlock.getY() - d0 > 0.0D)
{
return EnumFacing.DOWN;
}
}
return entityIn.getHorizontalFacing().getOpposite();
} }
} }
@ -761,55 +648,41 @@ public class ModelLoaderRegistryTest
*/ */
public static class OBJCustomDataBlock extends Block public static class OBJCustomDataBlock extends Block
{ {
public static final PropertyBool NORTH = PropertyBool.create("north"); public static final BooleanProperty NORTH = BooleanProperty.create("north");
public static final PropertyBool SOUTH = PropertyBool.create("south"); public static final BooleanProperty SOUTH = BooleanProperty.create("south");
public static final PropertyBool WEST = PropertyBool.create("west"); public static final BooleanProperty WEST = BooleanProperty.create("west");
public static final PropertyBool EAST = PropertyBool.create("east"); public static final BooleanProperty EAST = BooleanProperty.create("east");
public static final String name = "obj_custom_data_block"; public static final String name = "obj_custom_data_block";
private OBJCustomDataBlock() private OBJCustomDataBlock()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
this.setDefaultState(this.blockState.getBaseState().withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(WEST, false).withProperty(EAST, false)); this.setDefaultState(this.getStateContainer().getBaseState().with(NORTH, false).with(SOUTH, false).with(WEST, false).with(EAST, false));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override @Override
public boolean isFullCube(IBlockState state) public boolean isFullCube(IBlockState state)
{ {
return false; return false;
} }
@Override public boolean canConnectTo(IBlockReader world, BlockPos pos)
public int getMetaFromState(IBlockState state)
{
return 0;
}
public boolean canConnectTo(IBlockAccess world, BlockPos pos)
{ {
Block block = world.getBlockState(pos).getBlock(); Block block = world.getBlockState(pos).getBlock();
return block instanceof OBJCustomDataBlock; return block instanceof OBJCustomDataBlock;
} }
@Override @Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) public IBlockState updatePostPlacement(IBlockState state, EnumFacing facing, IBlockState facingState, IWorld world, BlockPos pos, BlockPos facingPos)
{ {
return state.withProperty(NORTH, this.canConnectTo(world, pos.north())).withProperty(SOUTH, this.canConnectTo(world, pos.south())).withProperty(WEST, this.canConnectTo(world, pos.west())).withProperty(EAST, this.canConnectTo(world, pos.east())); return state.with(NORTH, this.canConnectTo(world, pos.north())).with(SOUTH, this.canConnectTo(world, pos.south())).with(WEST, this.canConnectTo(world, pos.west())).with(EAST, this.canConnectTo(world, pos.east()));
} }
@Override @Override
public BlockStateContainer createBlockState() protected void fillStateContainer(Builder<Block, IBlockState> builder)
{ {
return new BlockStateContainer(this, NORTH, SOUTH, WEST, EAST); builder.add(NORTH, SOUTH, WEST, EAST);
} }
} }
@ -819,30 +692,22 @@ public class ModelLoaderRegistryTest
* @author shadekiller666 * @author shadekiller666
* *
*/ */
public static class OBJDynamicEye extends Block implements ITileEntityProvider public static class OBJDynamicEye extends Block
{ {
public static final String name = "obj_dynamic_eye"; public static final String name = "obj_dynamic_eye";
private OBJDynamicEye() private OBJDynamicEye()
{ {
super(Material.IRON); super(Properties.create(Material.IRON));
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName(MODID + ":" + name);
setRegistryName(new ResourceLocation(MODID, name)); setRegistryName(new ResourceLocation(MODID, name));
} }
@Override @Override
public TileEntity createNewTileEntity(World worldIn, int meta) public TileEntity createTileEntity(IBlockState state, IBlockReader world)
{ {
return new OBJDynamicEyeTileEntity(); return new OBJDynamicEyeTileEntity();
} }
@Override
public boolean isOpaqueCube(IBlockState state)
{
return false;
}
@Override @Override
public boolean isFullCube(IBlockState state) public boolean isFullCube(IBlockState state)
{ {
@ -855,7 +720,7 @@ public class ModelLoaderRegistryTest
return true; return true;
} }
@Override /* @Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos)
{ {
if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJDynamicEyeTileEntity) if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJDynamicEyeTileEntity)
@ -867,26 +732,25 @@ public class ModelLoaderRegistryTest
} }
} }
return state; return state;
} }*/
@Override
public BlockStateContainer createBlockState()
{
return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{Properties.AnimationProperty});
}
} }
public static class OBJDynamicEyeTileEntity extends TileEntity implements ITickable public static class OBJDynamicEyeTileEntity extends TileEntity implements ITickable
{ {
public OBJDynamicEyeTileEntity()
{
super(null); // TODO
}
private TRSRTransformation transform = TRSRTransformation.identity(); private TRSRTransformation transform = TRSRTransformation.identity();
@Override @Override
public void update() public void tick()
{ {
if (this.world.isRemote) if (this.world.isRemote)
{ {
Vector3d teLoc = new Vector3d(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); Vector3d teLoc = new Vector3d(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
EntityPlayer player = Minecraft.getMinecraft().player; EntityPlayer player = Minecraft.getInstance().player;
Vector3d playerLoc = new Vector3d(); Vector3d playerLoc = new Vector3d();
playerLoc.setX(player.posX); playerLoc.setX(player.posX);
playerLoc.setY(player.posY + player.getEyeHeight()); playerLoc.setY(player.posY + player.getEyeHeight());

4
src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java
View File

@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = MultiLayerModelTest.MODID, name = "ForgeDebugMultiLayerModel", version = MultiLayerModelTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = MultiLayerModelTest.MODID, name = "ForgeDebugMultiLayerModel", version = MultiLayerModelTest.VERSION, acceptableRemoteVersions = "*")
public class MultiLayerModelTest public class MultiLayerModelTest
{ {
private static final boolean ENABLED = true; private static final boolean ENABLED = true;
@ -47,7 +47,7 @@ public class MultiLayerModelTest
@ObjectHolder(blockName) @ObjectHolder(blockName)
public static final Block TEST_BLOCK = null; public static final Block TEST_BLOCK = null;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java
View File

@ -59,7 +59,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@Mod(modid = FastTESRTransparentTest.MODID, name = "TransparentFastTESRTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = FastTESRTransparentTest.MODID, name = "TransparentFastTESRTest", version = "1.0", acceptableRemoteVersions = "*")
public class FastTESRTransparentTest public class FastTESRTransparentTest
{ {
@ -214,7 +214,7 @@ public class FastTESRTransparentTest
} }
}; };
@EventBusSubscriber //@EventBusSubscriber
public static class BlockHolder public static class BlockHolder
{ {
@ -253,7 +253,7 @@ public class FastTESRTransparentTest
GameRegistry.registerTileEntity(TransparentFastTE.class, MODID + ":fast-tesr-te"); GameRegistry.registerTileEntity(TransparentFastTE.class, MODID + ":fast-tesr-te");
} }
@EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientLoader public static class ClientLoader
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java
View File

@ -47,14 +47,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
@Mod(modid = ItemTESRTest.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ItemTESRTest.MODID, name = "ForgeDebugItemTile", version = "1.0", acceptableRemoteVersions = "*")
public class ItemTESRTest public class ItemTESRTest
{ {
public static final String MODID = "forgedebugitemtile"; public static final String MODID = "forgedebugitemtile";
@ObjectHolder(TestBlock.name) @ObjectHolder(TestBlock.name)
public static final Block TEST_BLOCK = null; public static final Block TEST_BLOCK = null;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent
@ -71,7 +71,7 @@ public class ItemTESRTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class BakeEventHandler public static class BakeEventHandler
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java
View File

@ -36,7 +36,7 @@ import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry;
@Mod(modid = "wrnormal", name = "WRNormal", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "wrnormal", name = "WRNormal", version = "1.0", acceptableRemoteVersions = "*")
public class VertexBufferNormalTest public class VertexBufferNormalTest
{ {
@Instance("wrnormal") @Instance("wrnormal")

2
src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java
View File

@ -28,7 +28,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.fml.event.FMLServerStartingEvent;
@Mod(modid = "entityupdateblockedtest", name = "Entity Update Blocked Test", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "entityupdateblockedtest", name = "Entity Update Blocked Test", version = "1.0.0", acceptableRemoteVersions = "*")
public class BlockEntityUpdateTest public class BlockEntityUpdateTest
{ {
@Mod.EventHandler @Mod.EventHandler

2
src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "entitytraveltodimensioneventtest", name = "EntityTravelToDimensionEventTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "entitytraveltodimensioneventtest", name = "EntityTravelToDimensionEventTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class EntityTravelToDimensionEventTest public class EntityTravelToDimensionEventTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java
View File

@ -42,8 +42,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod(modid = GetCollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = GetCollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class GetCollisionBoxesEventTest public class GetCollisionBoxesEventTest
{ {
public static final String MODID = "collisionboxexeventtest"; public static final String MODID = "collisionboxexeventtest";

2
src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "projectile_event_test", name = "ProjectileImpactEvent test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "projectile_event_test", name = "ProjectileImpactEvent test mod", version = "1.0", acceptableRemoteVersions = "*")
public class ProjectileImpactEventTest public class ProjectileImpactEventTest
{ {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

4
src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.event.entity.living.AnimalTameEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class AnimalTameEventTest public class AnimalTameEventTest
{ {
static final String MOD_ID = "animal_tame_event_test"; static final String MOD_ID = "animal_tame_event_test";

4
src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = AttackEventTest.MODID, name = AttackEventTest.NAME, version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = AttackEventTest.MODID, name = AttackEventTest.NAME, version = "1.0.0", acceptableRemoteVersions = "*")
public class AttackEventTest public class AttackEventTest
{ {
@ -36,7 +36,7 @@ public class AttackEventTest
public static final String NAME = "LivingAttackEventTest"; public static final String NAME = "LivingAttackEventTest";
private static final Logger LOGGER = LogManager.getLogger(NAME); private static final Logger LOGGER = LogManager.getLogger(NAME);
@EventBusSubscriber //@EventBusSubscriber
public static class LivingAttackEventHandler public static class LivingAttackEventHandler
{ {

2
src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = BabyEntitySpawnEventTest.MODID, name = "BreedingTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = BabyEntitySpawnEventTest.MODID, name = "BreedingTest", version = "1.0", acceptableRemoteVersions = "*")
public class BabyEntitySpawnEventTest public class BabyEntitySpawnEventTest
{ {
public static final String MODID = "breedingtest"; public static final String MODID = "breedingtest";

2
src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = CheckSpawnEventTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = CheckSpawnEventTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*")
public class CheckSpawnEventTest public class CheckSpawnEventTest
{ {
public static final String MODID = "checkspawntest"; public static final String MODID = "checkspawntest";

2
src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
@Mod(modid = CustomSpawnPlacementTest.MOD_ID, name = "Custom SpawnPlacementType test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = CustomSpawnPlacementTest.MOD_ID, name = "Custom SpawnPlacementType test mod", version = "1.0", acceptableRemoteVersions = "*")
public class CustomSpawnPlacementTest public class CustomSpawnPlacementTest
{ {
static final String MOD_ID = "custom_spawn_placement_test"; static final String MOD_ID = "custom_spawn_placement_test";

4
src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java
View File

@ -43,7 +43,7 @@ import net.minecraftforge.fml.event.FMLServerStartingEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = DamageEventTest.MODID, name = "ForgeDebugLivingDamage", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = DamageEventTest.MODID, name = "ForgeDebugLivingDamage", version = "1.0", acceptableRemoteVersions = "*")
public class DamageEventTest public class DamageEventTest
{ {
@ -151,7 +151,7 @@ public class DamageEventTest
evt.registerServerCommand(new CommandDamage()); evt.registerServerCommand(new CommandDamage());
} }
@EventBusSubscriber //@EventBusSubscriber
public static class TestEventHandler public static class TestEventHandler
{ {

2
src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "equipment_change_test", name = "Equipment Change Test", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "equipment_change_test", name = "Equipment Change Test", version = "1.0.0", acceptableRemoteVersions = "*")
public class EquipmentChangeEventTest public class EquipmentChangeEventTest
{ {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

4
src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java
View File

@ -25,8 +25,8 @@ import net.minecraftforge.event.entity.living.LivingKnockBackEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = "kbhtest", name = "Knock Back Hook Test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "kbhtest", name = "Knock Back Hook Test", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class KnockBackEventTest public class KnockBackEventTest
{ {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

4
src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.Event.Result;
@Mod(modid = "entitymobgriefingeventtest", name = "EntityMobGriefingEventTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "entitymobgriefingeventtest", name = "EntityMobGriefingEventTest", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class MobGriefingEventTest public class MobGriefingEventTest
{ {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

4
src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java
View File

@ -24,8 +24,8 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = SpecialSpawnTest.MOD_ID, name = "Special Spawn Test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = SpecialSpawnTest.MOD_ID, name = "Special Spawn Test", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber(modid = SpecialSpawnTest.MOD_ID) //@Mod.EventBusSubscriber(modid = SpecialSpawnTest.MOD_ID)
public class SpecialSpawnTest public class SpecialSpawnTest
{ {
static final String MOD_ID = "special_spawn_test"; static final String MOD_ID = "special_spawn_test";

4
src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java
View File

@ -26,8 +26,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerCareer; import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerCareer;
import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession;
@Mod(modid = "professiontest", name = "ProfessionTest2000", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "professiontest", name = "ProfessionTest2000", version = "1.0", acceptableRemoteVersions = "*")
@EventBusSubscriber //@EventBusSubscriber
public class VillagerProfessionTest public class VillagerProfessionTest
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java
View File

@ -33,7 +33,7 @@ import net.minecraft.util.EnumHand;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword; import net.minecraft.item.ItemSword;
@Mod(modid = "criticalhiteventtest", name = "CriticalHitEventTest", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "criticalhiteventtest", name = "CriticalHitEventTest", version = "1.0.0", acceptableRemoteVersions = "*")
public class CriticalHitEventTest public class CriticalHitEventTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

2
src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java
View File

@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "playerdamagereworktest", name = "PlayerDamageReworkTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class DamageReworkTest public class DamageReworkTest
{ {
private static final boolean ENABLE = false; private static final boolean ENABLE = false;

2
src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent;
@Mod(modid = ItemPickupEventTest.MODID, name = ItemPickupEventTest.NAME, version = ItemPickupEventTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = ItemPickupEventTest.MODID, name = ItemPickupEventTest.NAME, version = ItemPickupEventTest.VERSION, acceptableRemoteVersions = "*")
public class ItemPickupEventTest public class ItemPickupEventTest
{ {

2
src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java
View File

@ -38,7 +38,7 @@ import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "playerinteracteventtest", name = "PlayerInteractEventTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "playerinteracteventtest", name = "PlayerInteractEventTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class PlayerInteractEventTest public class PlayerInteractEventTest
{ {
// NOTE: Test with both this ON and OFF - ensure none of the test behaviours show when this is off! // NOTE: Test with both this ON and OFF - ensure none of the test behaviours show when this is off!

2
src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "playersetspawntest", name = "Player Set Spawn Test", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "playersetspawntest", name = "Player Set Spawn Test", version = "0.0.0", acceptableRemoteVersions = "*")
public class PlayerSetSpawnTest public class PlayerSetSpawnTest
{ {
private static final boolean ENABLE = false; private static final boolean ENABLE = false;

6
src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java
View File

@ -34,8 +34,8 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = ReachDistanceAttributeTest.MODID, name = ReachDistanceAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ReachDistanceAttributeTest.MODID, name = ReachDistanceAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class ReachDistanceAttributeTest public class ReachDistanceAttributeTest
{ {
public static final String MODID = "reachdistanceattributetest"; public static final String MODID = "reachdistanceattributetest";
@ -46,7 +46,7 @@ public class ReachDistanceAttributeTest
evt.getRegistry().register(PLATE); evt.getRegistry().register(PLATE);
} }
@Mod.EventBusSubscriber(Side.CLIENT) //@Mod.EventBusSubscriber(Side.CLIENT)
public static class ClientEvents public static class ClientEvents
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java
View File

@ -34,8 +34,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = SwimSpeedAttributeTest.MODID, name = SwimSpeedAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = SwimSpeedAttributeTest.MODID, name = SwimSpeedAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class SwimSpeedAttributeTest public class SwimSpeedAttributeTest
{ {
public static final String MODID = "swimspeedattributetest"; public static final String MODID = "swimspeedattributetest";
@ -46,7 +46,7 @@ public class SwimSpeedAttributeTest
evt.getRegistry().register(PLATE); evt.getRegistry().register(PLATE);
} }
@Mod.EventBusSubscriber(Side.CLIENT) //@Mod.EventBusSubscriber(Side.CLIENT)
public static class ClientEvents public static class ClientEvents
{ {
@SubscribeEvent @SubscribeEvent

4
src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java
View File

@ -34,8 +34,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@Mod(modid = ColoredFluidTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*") //@Mod(modid = ColoredFluidTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*")
@EventBusSubscriber //@EventBusSubscriber
public class ColoredFluidTest public class ColoredFluidTest
{ {
static final boolean ENABLED = false; // <-- enable mod static final boolean ENABLED = false; // <-- enable mod

2
src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.Event.Result;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = "createfluidsourcetest", name = "CreateFluidSourceTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "createfluidsourcetest", name = "CreateFluidSourceTest", version = "1.0", acceptableRemoteVersions = "*")
public class CreateFluidSourceEventTest public class CreateFluidSourceEventTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java
View File

@ -85,7 +85,7 @@ import org.apache.logging.log4j.Logger;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidTest.MODID, acceptableRemoteVersions = "*") //@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidTest.MODID, acceptableRemoteVersions = "*")
public class DynBucketTest public class DynBucketTest
{ {
public static final String MODID = "dynbuckettest"; public static final String MODID = "dynbuckettest";
@ -179,7 +179,7 @@ public class DynBucketTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

2
src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java
View File

@ -36,7 +36,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
* - Replace the result of a stone generator with either diamond, or emerald when in a biome where emerald spawns naturally. * - 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. * - Prevent lava from setting surrounding blocks on fire.
*/ */
@Mod(modid = "fluidplaceblocktest", name = "FluidPlaceBlockTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "fluidplaceblocktest", name = "FluidPlaceBlockTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class FluidPlaceBlockEventTest public class FluidPlaceBlockEventTest
{ {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

6
src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java
View File

@ -62,7 +62,7 @@ import java.util.List;
import static net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack.FLUID_NBT_KEY; import static net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack.FLUID_NBT_KEY;
@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION, acceptableRemoteVersions = "*")
public class FluidPlacementTest public class FluidPlacementTest
{ {
public static final String MODID = "forgedebugfluidplacement"; public static final String MODID = "forgedebugfluidplacement";
@ -70,7 +70,7 @@ public class FluidPlacementTest
public static final boolean ENABLE = true; public static final boolean ENABLE = true;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent
@ -99,7 +99,7 @@ public class FluidPlacementTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java
View File

@ -38,7 +38,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@Mod(modid = "fluidhandlertest", name = "FluidHandlerTest", version = "0.0.0", clientSideOnly = true) //@Mod(modid = "fluidhandlertest", name = "FluidHandlerTest", version = "0.0.0", clientSideOnly = true)
public class ItemFluidHandlerTest public class ItemFluidHandlerTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java
View File

@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod(modid = AnytimeSleepingTest.MODID, name = "Anytime Sleeping Test", version = "0.0", acceptableRemoteVersions = "*") //@Mod(modid = AnytimeSleepingTest.MODID, name = "Anytime Sleeping Test", version = "0.0", acceptableRemoteVersions = "*")
public class AnytimeSleepingTest public class AnytimeSleepingTest
{ {
public static final String MODID = "anytimesleepingtest"; public static final String MODID = "anytimesleepingtest";
@ -58,7 +58,7 @@ public class AnytimeSleepingTest
} }
} }
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class BrewingRecipeRegistryTest public class BrewingRecipeRegistryTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java
View File

@ -33,8 +33,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.server.FMLServerStartedEvent; import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
@Mod(ConstantLoadingTest.MODID) //@Mod(ConstantLoadingTest.MODID)
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class ConstantLoadingTest public class ConstantLoadingTest
{ {
public static final String MODID = "constantloadingtest"; public static final String MODID = "constantloadingtest";

4
src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java
View File

@ -35,8 +35,8 @@ import org.apache.logging.log4j.Logger;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
@Mod(modid = CraftingSystemTest.MOD_ID, name = "CraftingTestMod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = CraftingSystemTest.MOD_ID, name = "CraftingTestMod", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class CraftingSystemTest public class CraftingSystemTest
{ {
static final String MOD_ID = "crafting_system_test"; static final String MOD_ID = "crafting_system_test";

2
src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java
View File

@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "difficultychangeeventtest", name = "DifficultyChangeEventTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "difficultychangeeventtest", name = "DifficultyChangeEventTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class DifficultyChangeEventTest public class DifficultyChangeEventTest
{ {
private static final boolean ENABLE = false; private static final boolean ENABLE = false;

2
src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java
View File

@ -44,7 +44,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
// TODO 1.13: implement without java.awt // TODO 1.13: implement without java.awt
@Mod(modid = DynamicBannerTest.MODID, name = "ForgeDebugDynamicBanner", version = DynamicBannerTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = DynamicBannerTest.MODID, name = "ForgeDebugDynamicBanner", version = DynamicBannerTest.VERSION, acceptableRemoteVersions = "*")
public class DynamicBannerTest public class DynamicBannerTest
{ {
private static final boolean ENABLE = false; private static final boolean ENABLE = false;

2
src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "enchantmentlevelsettest", name = "EnchantmentLevelSetTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "enchantmentlevelsettest", name = "EnchantmentLevelSetTest", version = "1.0", acceptableRemoteVersions = "*")
public class EnchantmentLevelSetEventTest public class EnchantmentLevelSetEventTest
{ {
public static final boolean ENABLE = false; public static final boolean ENABLE = false;

4
src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java
View File

@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
@Mod(modid = FurnaceFuelBurnTimeEventTest.MOD_ID, name = "Test for FurnaceFuelBurnTimeEvent", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = FurnaceFuelBurnTimeEventTest.MOD_ID, name = "Test for FurnaceFuelBurnTimeEvent", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class FurnaceFuelBurnTimeEventTest public class FurnaceFuelBurnTimeEventTest
{ {
public static final String MOD_ID = "furnacefuelburntimeeventtest"; public static final String MOD_ID = "furnacefuelburntimeeventtest";

2
src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java
View File

@ -35,7 +35,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
* 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. * 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"... * It's not a dupe glitch...it's a dupe "feature"...
*/ */
@Mod(modid = "giveitemtoplayertest", name = "ItemHandlerHelper.giveItemToPlayer Test", version = "1.0") //@Mod(modid = "giveitemtoplayertest", name = "ItemHandlerHelper.giveItemToPlayer Test", version = "1.0")
public class GiveItemToPlayerTest { public class GiveItemToPlayerTest {
private static final boolean ENABLED = false; private static final boolean ENABLED = false;

4
src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java
View File

@ -29,12 +29,12 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputUpdateEvent; import net.minecraftforge.client.event.InputUpdateEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@Mod(modid = InputUpdateEventTest.MODID, name = "InputUpdateTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = InputUpdateEventTest.MODID, name = "InputUpdateTest", version = "1.0", acceptableRemoteVersions = "*")
public class InputUpdateEventTest public class InputUpdateEventTest
{ {
static final String MODID = "input_update_test"; static final String MODID = "input_update_test";
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

4
src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java
View File

@ -56,7 +56,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@Mod(modid = NoBedSleepingTest.MODID, name = "ForgeDebugNoBedSleeping", version = NoBedSleepingTest.VERSION, acceptableRemoteVersions = "*") //@Mod(modid = NoBedSleepingTest.MODID, name = "ForgeDebugNoBedSleeping", version = NoBedSleepingTest.VERSION, acceptableRemoteVersions = "*")
public class NoBedSleepingTest public class NoBedSleepingTest
{ {
public static final String MODID = "forgedebugnobedsleeping"; public static final String MODID = "forgedebugnobedsleeping";
@ -66,7 +66,7 @@ public class NoBedSleepingTest
@ObjectHolder(ItemSleepingPill.name) @ObjectHolder(ItemSleepingPill.name)
public static final Item SLEEPING_PILL = null; public static final Item SLEEPING_PILL = null;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent

6
src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java
View File

@ -36,8 +36,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
@Mod.EventBusSubscriber import java.util.Random;
@Mod(modid = PotionRegistryTest.MOD_ID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*")
//@Mod.EventBusSubscriber
//@Mod(modid = PotionRegistryTest.MODID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*")
public class PotionRegistryTest public class PotionRegistryTest
{ {
public static final String MOD_ID = "forge_potion_registry"; public static final String MOD_ID = "forge_potion_registry";

2
src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java
View File

@ -39,7 +39,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
@Mod(modid = RecipeMatchingTest.MODID, name = "Recipe test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = RecipeMatchingTest.MODID, name = "Recipe test mod", version = "1.0", acceptableRemoteVersions = "*")
public class RecipeMatchingTest public class RecipeMatchingTest
{ {
public static final String MODID = "recipetest"; public static final String MODID = "recipetest";

4
src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java
View File

@ -29,8 +29,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent;
@Mod(name = "advancementcriteriontest", modid = "advancementcriteriontest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(name = "advancementcriteriontest", modid = "advancementcriteriontest", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class AdvancementCriterionTest { public class AdvancementCriterionTest {
private static final PositionTrigger TRIGGER = new PositionTrigger(new ResourceLocation("advancementcriteriontest", "position")); private static final PositionTrigger TRIGGER = new PositionTrigger(new ResourceLocation("advancementcriteriontest", "position"));

2
src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = AdvancementEventTest.MOD_ID, name = "AdvancementEvent test mod", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = AdvancementEventTest.MOD_ID, name = "AdvancementEvent test mod", version = "1.0.0", acceptableRemoteVersions = "*")
public class AdvancementEventTest public class AdvancementEventTest
{ {
static final String MOD_ID = "advancement_event_test"; static final String MOD_ID = "advancement_event_test";

2
src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java
View File

@ -21,7 +21,7 @@ package net.minecraftforge.debug.gameplay.advancement;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*")
public class AdvancementsPaginationTest public class AdvancementsPaginationTest
{ {
} }

4
src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java
View File

@ -46,8 +46,8 @@ import java.util.Set;
* Most of the real work is in the advancements directory of this mod. * Most of the real work is in the advancements directory of this mod.
* This mod tests ore-dict advancement triggers. * This mod tests ore-dict advancement triggers.
*/ */
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*")
public class OredictTriggerTest public class OredictTriggerTest
{ {
public static final String MODID = "oredict_predicate"; public static final String MODID = "oredict_predicate";

4
src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java
View File

@ -49,8 +49,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.ForgeRegistries;
@EventBusSubscriber //@EventBusSubscriber
@Mod(modid = LootContextTweaksTest.MODID, name = "LootContextTweaksTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = LootContextTweaksTest.MODID, name = "LootContextTweaksTest", version = "1.0", acceptableRemoteVersions = "*")
public class LootContextTweaksTest public class LootContextTweaksTest
{ {
public static final String MODID = "loot_context_tweaks_test"; public static final String MODID = "loot_context_tweaks_test";

2
src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java
View File

@ -29,7 +29,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = LootTableLoadEventTest.MODID, name = "LootTableLoadEventTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = LootTableLoadEventTest.MODID, name = "LootTableLoadEventTest", version = "1.0", acceptableRemoteVersions = "*")
public class LootTableLoadEventTest public class LootTableLoadEventTest
{ {
public static final boolean ENABLED = false; public static final boolean ENABLED = false;

2
src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java
View File

@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.event.FMLInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = LootTableTest.MODID, name = "Loot Table Debug", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = LootTableTest.MODID, name = "Loot Table Debug", version = "1.0", acceptableRemoteVersions = "*")
public class LootTableTest public class LootTableTest
{ {
public static final String MODID = "loot_table_debug"; public static final String MODID = "loot_table_debug";

2
src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java
View File

@ -28,7 +28,7 @@ import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; 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 = "*")
public class BonemealEventTest public class BonemealEventTest
{ {
public static final String MODID = "bonemealeventtest"; public static final String MODID = "bonemealeventtest";

6
src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java
View File

@ -30,7 +30,7 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = CanApplyAtEnchantingTableTest.MODID, name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = CanApplyAtEnchantingTableTest.MODID, name = "CanApplyAtEnchantingTableTest", version = "0.0.0", acceptableRemoteVersions = "*")
public class CanApplyAtEnchantingTableTest public class CanApplyAtEnchantingTableTest
{ {
public static final String MODID = "can_apply_at_enchanting_table_test"; public static final String MODID = "can_apply_at_enchanting_table_test";
@ -57,7 +57,7 @@ public class CanApplyAtEnchantingTableTest
} }
}; };
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent
@ -73,7 +73,7 @@ public class CanApplyAtEnchantingTableTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

4
src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java
View File

@ -29,13 +29,13 @@ import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = CanDestroyBlocksInCreativeTest.MODID, name = "Item.canDestroyBlockInCreative() Test", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = CanDestroyBlocksInCreativeTest.MODID, name = "Item.canDestroyBlockInCreative() Test", version = "1.0", acceptableRemoteVersions = "*")
public class CanDestroyBlocksInCreativeTest public class CanDestroyBlocksInCreativeTest
{ {
public static final boolean ENABLE = true; public static final boolean ENABLE = true;
public static final String MODID = "item_can_destroy_blocks_in_creative_test"; public static final String MODID = "item_can_destroy_blocks_in_creative_test";
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent

4
src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java
View File

@ -38,8 +38,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@Mod(modid = ContinuousUseItemTest.MOD_ID, name = "Test for canContinueUsing", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = ContinuousUseItemTest.MOD_ID, name = "Test for canContinueUsing", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class ContinuousUseItemTest public class ContinuousUseItemTest
{ {
static final String MOD_ID = "continuous_use_item_test"; static final String MOD_ID = "continuous_use_item_test";

6
src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java
View File

@ -37,8 +37,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
@EventBusSubscriber //@EventBusSubscriber
@Mod(modid = HorseArmorTest.MODID, name = "HorseArmorTest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = HorseArmorTest.MODID, name = "HorseArmorTest", version = "1.0", acceptableRemoteVersions = "*")
public class HorseArmorTest public class HorseArmorTest
{ {
public static final String MODID = "horse_armor_test"; public static final String MODID = "horse_armor_test";
@ -63,7 +63,7 @@ public class HorseArmorTest
event.getRegistry().register(new ItemTestHorseArmor().setRegistryName(MODID, "test_armor").setUnlocalizedName(MODID + ".testArmor")); event.getRegistry().register(new ItemTestHorseArmor().setRegistryName(MODID, "test_armor").setUnlocalizedName(MODID + ".testArmor"));
} }
@EventBusSubscriber(modid = MODID, value = Side.CLIENT) //@EventBusSubscriber(modid = MODID, value = Side.CLIENT)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

6
src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java
View File

@ -29,8 +29,8 @@ import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class IsBookEnchantableTest public class IsBookEnchantableTest
{ {
public static final boolean ENABLED = false; public static final boolean ENABLED = false;
@ -47,7 +47,7 @@ public class IsBookEnchantableTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

2
src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java
View File

@ -30,7 +30,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod(modid = "itemfishtest", name = "ItemFishTest", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "itemfishtest", name = "ItemFishTest", version = "1.0.0", acceptableRemoteVersions = "*")
public class ItemFishedEventTest public class ItemFishedEventTest
{ {

2
src/test/java/net/minecraftforge/debug/item/MapDataTest.java
View File

@ -59,7 +59,7 @@ import javax.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
@Mod(modid = "mapdatatest", name = "mapdatatest", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "mapdatatest", name = "mapdatatest", version = "1.0", acceptableRemoteVersions = "*")
public class MapDataTest public class MapDataTest
{ {
@GameRegistry.ObjectHolder("mapdatatest:custom_map") @GameRegistry.ObjectHolder("mapdatatest:custom_map")

4
src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java
View File

@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
@Mod(modid = MendingRepairTest.MOD_ID, name = "Mending repair amount test mod", version = "1.0") //@Mod(modid = MendingRepairTest.MOD_ID, name = "Mending repair amount test mod", version = "1.0")
public class MendingRepairTest public class MendingRepairTest
{ {
static final boolean ENABLED = true; static final boolean ENABLED = true;

4
src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java
View File

@ -38,7 +38,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@Mod(modid = NBTShareTagTest.MODID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*") //@Mod(modid = NBTShareTagTest.MODID, name = "NBTShareTag Item Test", version = "1.0.0", acceptableRemoteVersions = "*")
public class NBTShareTagTest public class NBTShareTagTest
{ {
public static final String MODID = "nbtsharetagitemtest"; public static final String MODID = "nbtsharetagitemtest";
@ -46,7 +46,7 @@ public class NBTShareTagTest
@ObjectHolder("nbt_share_tag_item") @ObjectHolder("nbt_share_tag_item")
public static final Item TEST_ITEM = null; public static final Item TEST_ITEM = null;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@net.minecraftforge.eventbus.api.SubscribeEvent @net.minecraftforge.eventbus.api.SubscribeEvent

4
src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java
View File

@ -35,8 +35,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
@Mod(modid = OnItemUseFirstTest.MODID, name = "OnItemUseFirstTest", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = OnItemUseFirstTest.MODID, name = "OnItemUseFirstTest", version = "0.0.0", acceptableRemoteVersions = "*")
@Mod.EventBusSubscriber //@Mod.EventBusSubscriber
public class OnItemUseFirstTest public class OnItemUseFirstTest
{ {
public static final boolean ENABLE = true; public static final boolean ENABLE = true;

6
src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java
View File

@ -46,7 +46,7 @@ import java.util.List;
* 3. Drink incurable_potion from Brewing creative tab * 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 * 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 = "*") //@Mod(modid = PotionCurabilityTest.MODID, name = "Potion Curative Item Debug", version = "1.0", acceptableRemoteVersions = "*")
public class PotionCurabilityTest public class PotionCurabilityTest
{ {
public static final boolean ENABLED = false; public static final boolean ENABLED = false;
@ -56,7 +56,7 @@ public class PotionCurabilityTest
public static final Item MEDICINE = null; public static final Item MEDICINE = null;
private static Potion INCURABLE_POTION; private static Potion INCURABLE_POTION;
@Mod.EventBusSubscriber(modid = MODID) //@Mod.EventBusSubscriber(modid = MODID)
public static class Registration public static class Registration
{ {
@SubscribeEvent @SubscribeEvent
@ -88,7 +88,7 @@ public class PotionCurabilityTest
} }
} }
@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID)
public static class ClientEventHandler public static class ClientEventHandler
{ {
@SubscribeEvent @SubscribeEvent

2
src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java
View File

@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.ForgeRegistries;
@Mod(modid = PotionShouldRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = PotionShouldRenderTest.modID, name = "No Potion Effect Render Test", version = "0.0.0", acceptableRemoteVersions = "*")
public class PotionShouldRenderTest public class PotionShouldRenderTest
{ {
public static final String modID = "nopotioneffect"; public static final String modID = "nopotioneffect";

4
src/test/java/net/minecraftforge/debug/item/ShieldTest.java
View File

@ -41,8 +41,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@ObjectHolder("shield_test") @ObjectHolder("shield_test")
@EventBusSubscriber //@EventBusSubscriber
@Mod(modid = "shield_test", name = "Shield Test", version = "0.0.0", acceptableRemoteVersions = "*") //@Mod(modid = "shield_test", name = "Shield Test", version = "0.0.0", acceptableRemoteVersions = "*")
public class ShieldTest public class ShieldTest
{ {
public static final ItemShield DIAMOND_SHIELD = null; public static final ItemShield DIAMOND_SHIELD = null;

2
src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java
View File

@ -29,7 +29,7 @@ import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@Mod("enumplanttypetest") //@Mod("enumplanttypetest")
public class EnumPlantTypeTest public class EnumPlantTypeTest
{ {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();

2
src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java
View File

@ -50,7 +50,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.List; import java.util.List;
@Mod(modid = "forge.testcapmod", name = "Forge TestCapMod", version = "1.0", acceptableRemoteVersions = "*") //@Mod(modid = "forge.testcapmod", name = "Forge TestCapMod", version = "1.0", acceptableRemoteVersions = "*")
public class CapabilityTest public class CapabilityTest
{ {
// A Holder/Marker for if this capability is installed. // A Holder/Marker for if this capability is installed.

2
src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java
View File

@ -32,7 +32,7 @@ import net.minecraftforge.fml.event.FMLLoadCompleteEvent;
import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
@Mod(modid = "clientexceptiontest", version = "1.0", name = "Client Exception Test", clientSideOnly = true) //@Mod(modid = "clientexceptiontest", version = "1.0", name = "Client Exception Test", clientSideOnly = true)
public class ClientLoadingExceptionTest public class ClientLoadingExceptionTest
{ {

Some files were not shown because too many files have changed in this diff Show More