From e482793f69da9f9e0c4188e53269340ca93d29fb Mon Sep 17 00:00:00 2001 From: tterrag Date: Fri, 22 Mar 2019 20:33:18 -0400 Subject: [PATCH] Comment out test Mod/EventBusSubscriber annotations, fix up ModelLoaderRegistryTest --- .../minecraftforge/debug/PotionEventTest.java | 2 +- .../debug/block/BasePlaceEventTest.java | 4 +- .../debug/block/FarmlandTrampleEventTest.java | 4 +- .../debug/block/FarmlandWaterTest.java | 2 +- .../debug/block/MaterialFogColorTest.java | 6 +- .../debug/block/NeighborNotifyEventTest.java | 2 +- .../debug/block/ParticleEffectsTest.java | 6 +- .../debug/block/PathNodeTypeTest.java | 6 +- .../debug/block/PlaceEventTest.java | 4 +- .../debug/block/PortalSpawnEventTest.java | 4 +- .../debug/block/SlipperinessTest.java | 6 +- .../debug/block/StickyBlockTest.java | 4 +- .../debug/chat/ClientChatEventTest.java | 2 +- .../debug/chat/ClientCommandTest.java | 2 +- .../debug/chat/CommandEventTest.java | 2 +- .../debug/chat/CommandTreeBaseTest.java | 2 +- .../debug/chat/EntitySelectorTest.java | 2 +- .../client/CustomTextureAtlasSpriteTest.java | 4 +- .../debug/client/FOVModifierEventTest.java | 2 +- .../client/SearchableCreativeTabTest.java | 2 +- .../gui/ContainerDrawForegroundEventTest.java | 4 +- .../client/gui/TooltipColorEventTest.java | 2 +- .../debug/client/model/AnimatedModelTest.java | 6 +- .../client/model/BlockstateRetextureTest.java | 4 +- .../model/ForgeBlockStatesLoaderTest.java | 6 +- .../client/model/ItemLayerModelTest.java | 4 +- .../client/model/ItemModelConflictTest.java | 6 +- .../client/model/ItemModelGenerationTest.java | 6 +- .../client/model/ModelBakeEventTest.java | 6 +- .../debug/client/model/ModelFluidTest.java | 6 +- .../client/model/ModelLoaderRegistryTest.java | 448 ++++++------------ .../client/model/MultiLayerModelTest.java | 4 +- .../rendering/FastTESRTransparentTest.java | 6 +- .../debug/client/rendering/ItemTESRTest.java | 6 +- .../rendering/VertexBufferNormalTest.java | 2 +- .../debug/entity/BlockEntityUpdateTest.java | 2 +- .../EntityTravelToDimensionEventTest.java | 2 +- .../entity/GetCollisionBoxesEventTest.java | 4 +- .../entity/ProjectileImpactEventTest.java | 2 +- .../entity/living/AnimalTameEventTest.java | 4 +- .../debug/entity/living/AttackEventTest.java | 4 +- .../living/BabyEntitySpawnEventTest.java | 2 +- .../entity/living/CheckSpawnEventTest.java | 2 +- .../living/CustomSpawnPlacementTest.java | 2 +- .../debug/entity/living/DamageEventTest.java | 4 +- .../living/EquipmentChangeEventTest.java | 2 +- .../entity/living/KnockBackEventTest.java | 4 +- .../entity/living/MobGriefingEventTest.java | 4 +- .../debug/entity/living/SpecialSpawnTest.java | 4 +- .../entity/living/VillagerProfessionTest.java | 4 +- .../entity/player/CriticalHitEventTest.java | 2 +- .../debug/entity/player/DamageReworkTest.java | 2 +- .../entity/player/ItemPickupEventTest.java | 2 +- .../player/PlayerInteractEventTest.java | 2 +- .../entity/player/PlayerSetSpawnTest.java | 2 +- .../player/ReachDistanceAttributeTest.java | 6 +- .../entity/player/SwimSpeedAttributeTest.java | 6 +- .../debug/fluid/ColoredFluidTest.java | 4 +- .../fluid/CreateFluidSourceEventTest.java | 2 +- .../debug/fluid/DynBucketTest.java | 4 +- .../debug/fluid/FluidPlaceBlockEventTest.java | 2 +- .../debug/fluid/FluidPlacementTest.java | 6 +- .../debug/fluid/ItemFluidHandlerTest.java | 2 +- .../debug/gameplay/AnytimeSleepingTest.java | 4 +- .../gameplay/BrewingRecipeRegistryTest.java | 2 +- .../debug/gameplay/ConstantLoadingTest.java | 4 +- .../debug/gameplay/CraftingSystemTest.java | 4 +- .../gameplay/DifficultyChangeEventTest.java | 2 +- .../debug/gameplay/DynamicBannerTest.java | 2 +- .../EnchantmentLevelSetEventTest.java | 2 +- .../FurnaceFuelBurnTimeEventTest.java | 4 +- .../debug/gameplay/GiveItemToPlayerTest.java | 2 +- .../debug/gameplay/InputUpdateEventTest.java | 4 +- .../debug/gameplay/NoBedSleepingTest.java | 4 +- .../debug/gameplay/PotionRegistryTest.java | 6 +- .../debug/gameplay/RecipeMatchingTest.java | 2 +- .../advancement/AdvancementCriterionTest.java | 4 +- .../advancement/AdvancementEventTest.java | 2 +- .../AdvancementsPaginationTest.java | 2 +- .../advancement/OredictTriggerTest.java | 4 +- .../gameplay/loot/LootContextTweaksTest.java | 4 +- .../gameplay/loot/LootTableLoadEventTest.java | 2 +- .../debug/gameplay/loot/LootTableTest.java | 2 +- .../debug/item/BonemealEventTest.java | 2 +- .../item/CanApplyAtEnchantingTableTest.java | 6 +- .../item/CanDestroyBlocksInCreativeTest.java | 4 +- .../debug/item/ContinuousUseItemTest.java | 4 +- .../debug/item/HorseArmorTest.java | 6 +- .../debug/item/IsBookEnchantableTest.java | 6 +- .../debug/item/ItemFishedEventTest.java | 2 +- .../debug/item/MapDataTest.java | 2 +- .../debug/item/MendingRepairTest.java | 4 +- .../debug/item/NBTShareTagTest.java | 4 +- .../debug/item/OnItemUseFirstTest.java | 4 +- .../debug/item/PotionCurabilityTest.java | 6 +- .../debug/item/PotionShouldRenderTest.java | 2 +- .../minecraftforge/debug/item/ShieldTest.java | 4 +- .../debug/misc/EnumPlantTypeTest.java | 2 +- .../debug/mod/CapabilityTest.java | 2 +- .../debug/mod/ClientLoadingExceptionTest.java | 2 +- .../debug/mod/ConfigAnnotationTest.java | 2 +- .../debug/mod/ObjectHolderAnnotationTest.java | 4 +- .../debug/mod/PermissionTest.java | 2 +- .../debug/mod/RegistryOverrideTest.java | 4 +- .../debug/network/BigNetworkMessageTest.java | 4 +- .../debug/network/TrackingTargetTest.java | 4 +- .../debug/util/ModNameTooltip.java | 4 +- .../debug/util/RotatingWrench.java | 4 +- .../debug/util/TextureDumper.java | 2 +- .../village/MerchantTradeOffersEventTest.java | 2 +- .../debug/village/VillageSiegeEventTest.java | 2 +- .../debug/world/ChunkCapabilityTest.java | 2 +- .../debug/world/ChunkWatchEventTest.java | 2 +- .../debug/world/DecorateEventDebug.java | 2 +- .../debug/world/SpawnDimensionTest.java | 2 +- .../debug/world/TileEntityLoadingTest.java | 6 +- .../debug/world/WorldCapabilityTest.java | 2 +- .../world/WorldProviderCanSleepAtTest.java | 2 +- .../fml/test/ForgeNetworkTestMod.java | 2 +- .../fml/test/SpecialSpawnEventTest.java | 2 +- .../test/SelectorHandlerTest.java | 2 +- src/test/resources/META-INF/mods.toml | 81 +--- .../blockstates/custom_model_block.json | 4 - .../blockstates/obj_custom_data_block.json | 7 - src/test/resources/pack.mcmeta | 6 + 125 files changed, 369 insertions(+), 583 deletions(-) create mode 100644 src/test/resources/pack.mcmeta diff --git a/src/test/java/net/minecraftforge/debug/PotionEventTest.java b/src/test/java/net/minecraftforge/debug/PotionEventTest.java index 39be750993..e5f4a348e5 100644 --- a/src/test/java/net/minecraftforge/debug/PotionEventTest.java +++ b/src/test/java/net/minecraftforge/debug/PotionEventTest.java @@ -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.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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/block/BasePlaceEventTest.java b/src/test/java/net/minecraftforge/debug/block/BasePlaceEventTest.java index ecb1bfe8a7..3ae512c4be 100644 --- a/src/test/java/net/minecraftforge/debug/block/BasePlaceEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/BasePlaceEventTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = BasePlaceEventTest.MOD_ID, name = "BaseBlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = BasePlaceEventTest.MOD_ID, name = "BaseBlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class BasePlaceEventTest { static final String MOD_ID = "base_block_place_event_test"; diff --git a/src/test/java/net/minecraftforge/debug/block/FarmlandTrampleEventTest.java b/src/test/java/net/minecraftforge/debug/block/FarmlandTrampleEventTest.java index 7e468bd8ec..467502179c 100644 --- a/src/test/java/net/minecraftforge/debug/block/FarmlandTrampleEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/FarmlandTrampleEventTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = FarmlandTrampleEventTest.MOD_ID, name = "Farmland Trample Event Test", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = FarmlandTrampleEventTest.MOD_ID, name = "Farmland Trample Event Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class FarmlandTrampleEventTest { static final String MOD_ID = "farmland_trample_test"; diff --git a/src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java b/src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java index 85dea243d3..0fbaa8618a 100644 --- a/src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java +++ b/src/test/java/net/minecraftforge/debug/block/FarmlandWaterTest.java @@ -47,7 +47,7 @@ import org.apache.logging.log4j.Logger; 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 { //This adds a block that creates a 4x4x4 watered region when activated diff --git a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java index 0566bf7d4a..4bc8490979 100644 --- a/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java +++ b/src/test/java/net/minecraftforge/debug/block/MaterialFogColorTest.java @@ -48,8 +48,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@EventBusSubscriber -@Mod(modid = MaterialFogColorTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber +//@Mod(modid = MaterialFogColorTest.MODID, name = "FogColor inside material debug.", version = "1.0", acceptableRemoteVersions = "*") public class MaterialFogColorTest { 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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java index 31e3327cd9..22e109e7e3 100644 --- a/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/NeighborNotifyEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { diff --git a/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java b/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java index 6fedea6796..1a20747ecc 100644 --- a/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java +++ b/src/test/java/net/minecraftforge/debug/block/ParticleEffectsTest.java @@ -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_NAME; -@EventBusSubscriber -@Mod (modid = MOD_ID, name = MOD_NAME, version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber +//@Mod(modid = MOD_ID, name = MOD_NAME, version = "1.0", acceptableRemoteVersions = "*") public class ParticleEffectsTest { @@ -117,7 +117,7 @@ public class ParticleEffectsTest event.getRegistry().register(item.setRegistryName(particleBlockLocation)); } - @EventBusSubscriber (value = Side.CLIENT, modid = MOD_ID) + //@EventBusSubscriber (value = Side.CLIENT, modid = MOD_ID) public static class ClientEventHandler { diff --git a/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java index ffe7e70e7a..e36ad37364 100644 --- a/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PathNodeTypeTest.java @@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Mod; import java.util.Collections; -@Mod(modid = PathNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = PathNodeTypeTest.MOD_ID, name = "AiNodeTypeTest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class PathNodeTypeTest { 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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java b/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java index 00a7e57d0f..38e545970c 100644 --- a/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PlaceEventTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = PlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = PlaceEventTest.MOD_ID, name = "BlockPlaceEvent test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class PlaceEventTest { static final String MOD_ID = "block_place_event_test"; diff --git a/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java b/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java index 7cae4dbb04..60c18fbf69 100644 --- a/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java +++ b/src/test/java/net/minecraftforge/debug/block/PortalSpawnEventTest.java @@ -25,8 +25,8 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = PortalSpawnEventTest.MOD_ID, name = "PortalSpawnEvent test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = PortalSpawnEventTest.MOD_ID, name = "PortalSpawnEvent test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class PortalSpawnEventTest { static final String MOD_ID = "portal_spawn_event_test"; diff --git a/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java b/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java index 4ef62ef6b2..4fb5a84ac9 100644 --- a/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java +++ b/src/test/java/net/minecraftforge/debug/block/SlipperinessTest.java @@ -40,8 +40,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import java.util.Collections; -@Mod(modid = SlipperinessTest.MOD_ID, name = "Slipperiness Test", version = "0.0.0", acceptableRemoteVersions = "*") -@EventBusSubscriber +//@Mod(modid = SlipperinessTest.MOD_ID, name = "Slipperiness Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber public class SlipperinessTest { 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())); } - @EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) + //@EventBusSubscriber(value = Side.CLIENT, modid = MOD_ID) public static class ClientEventHandler { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java index 71ded772b6..d0c5345864 100644 --- a/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java +++ b/src/test/java/net/minecraftforge/debug/block/StickyBlockTest.java @@ -42,7 +42,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; 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 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())); } - @EventBusSubscriber(value = Side.CLIENT, modid = MODID) + //@EventBusSubscriber(value = Side.CLIENT, modid = MODID) public static class BakeEventHandler { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java index 51d0e6a6ea..c8cbf7d5de 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientChatEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLInitializationEvent; 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 { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java index 4436c4f25c..58554f0c9f 100644 --- a/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/ClientCommandTest.java @@ -37,7 +37,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true) +//@Mod(modid = "clientcommandtest", name = "Client Command Test", version = "0.0.0", clientSideOnly = true) public class ClientCommandTest { @EventHandler diff --git a/src/test/java/net/minecraftforge/debug/chat/CommandEventTest.java b/src/test/java/net/minecraftforge/debug/chat/CommandEventTest.java index d50b6ce443..bfb9cb07be 100644 --- a/src/test/java/net/minecraftforge/debug/chat/CommandEventTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/CommandEventTest.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; -@Mod("command_event_test") +//@Mod("command_event_test") public class CommandEventTest { public final Logger LOGGER = LogManager.getLogger(); diff --git a/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java index 1082f075d8..9f97d34265 100644 --- a/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/CommandTreeBaseTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.FMLServerStartingEvent; 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 static final String MOD_ID = "command_tree_base_test"; diff --git a/src/test/java/net/minecraftforge/debug/chat/EntitySelectorTest.java b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorTest.java index f7c344a994..146802ab14 100644 --- a/src/test/java/net/minecraftforge/debug/chat/EntitySelectorTest.java +++ b/src/test/java/net/minecraftforge/debug/chat/EntitySelectorTest.java @@ -34,7 +34,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; -@Mod("entity_selector_test") +//@Mod("entity_selector_test") public class EntitySelectorTest { public EntitySelectorTest() diff --git a/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java index abdececa2b..749ef17081 100644 --- a/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java +++ b/src/test/java/net/minecraftforge/debug/client/CustomTextureAtlasSpriteTest.java @@ -43,7 +43,7 @@ import java.util.function.Function; /** * 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 { static final String MOD_ID = "custom_sprite_test"; @@ -51,7 +51,7 @@ public class CustomTextureAtlasSpriteTest private static Logger logger; - @Mod.EventBusSubscriber(modid = MOD_ID) + //@Mod.EventBusSubscriber(modid = MOD_ID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java index b6b08aac0e..64047c616d 100644 --- a/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/FOVModifierEventTest.java @@ -30,7 +30,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; /** * Simple mod to test fov modifier. */ -@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true) +//@Mod(modid = "fovmodifiertest", name = "FOV Modifier Test", version = "0.0.0", clientSideOnly = true) public class FOVModifierEventTest { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java b/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java index 91ad556a62..c25faa955a 100644 --- a/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java +++ b/src/test/java/net/minecraftforge/debug/client/SearchableCreativeTabTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.common.Mod; 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 static final String MODID = "debugsearchtab"; diff --git a/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java b/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java index 229fcd72aa..c105cb7b87 100644 --- a/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/gui/ContainerDrawForegroundEventTest.java @@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@EventBusSubscriber(Side.CLIENT) -@Mod (modid = "guicontainereventtest", name = "GuiContainer Event Tests!", version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber(Side.CLIENT) +//@Mod(modid = "guicontainereventtest", name = "GuiContainer Event Tests!", version = "1.0", acceptableRemoteVersions = "*") public class ContainerDrawForegroundEventTest { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java b/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java index 5b93a30d65..0cbc15e11f 100644 --- a/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/gui/TooltipColorEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -@Mod(modid = TooltipColorEventTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true) +//@Mod(modid = TooltipColorEventTest.MODID, name = "Tooltip Color Test", version = "0.1", clientSideOnly = true) public class TooltipColorEventTest { public static final String MODID = "tooltipcolortest"; diff --git a/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java index b71c92a7fc..7c85b3c45d 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/AnimatedModelTest.java @@ -81,7 +81,7 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; 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 static final String MODID = "forgedebugmodelanimation"; @@ -107,7 +107,7 @@ public class AnimatedModelTest private static Logger logger; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent @@ -283,7 +283,7 @@ public class AnimatedModelTest 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 { diff --git a/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java index 8bb83673b2..27a27ddf9c 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/BlockstateRetextureTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; 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 static final String MODID = "forge_blockstate_retexture_test"; @@ -53,7 +53,7 @@ public class BlockstateRetextureTest 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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java b/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java index f0b0e66bdd..6159caa535 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ForgeBlockStatesLoaderTest.java @@ -40,8 +40,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import java.util.Map; import java.util.Map.Entry; -@Mod(modid = ForgeBlockStatesLoaderTest.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = ForgeBlockStatesLoaderTest.MODID, name = "ForgeBlockStatesLoader", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class ForgeBlockStatesLoaderTest { public static final String MODID = "forgeblockstatesloader"; @@ -82,7 +82,7 @@ public class ForgeBlockStatesLoaderTest //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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java b/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java index 17d303c176..8d03bd3369 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ItemLayerModelTest.java @@ -40,7 +40,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import javax.annotation.Nullable; 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 static final String MODID = "forgedebugitemlayermodel"; @@ -48,7 +48,7 @@ public class ItemLayerModelTest @ObjectHolder("test_item") public static final Item TEST_ITEM = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java b/src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java index 8e94d32e02..b9142f46d2 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ItemModelConflictTest.java @@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -@Mod.EventBusSubscriber -@Mod(modid = ItemModelConflictTest.MODID, name = "Test mod for model conflicts", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber +//@Mod(modid = ItemModelConflictTest.MODID, name = "Test mod for model conflicts", version = "1.0", acceptableRemoteVersions = "*") public class ItemModelConflictTest { 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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java b/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java index e095f2cde3..a1387750f9 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ItemModelGenerationTest.java @@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod.EventBusSubscriber -@Mod(modid = ItemModelGenerationTest.MOD_ID, name = "Item model generation test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber +//@Mod(modid = ItemModelGenerationTest.MOD_ID, name = "Item model generation test", version = "1.0", acceptableRemoteVersions = "*") public class ItemModelGenerationTest { 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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java index 995313e4ab..6f9e5962e7 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelBakeEventTest.java @@ -68,7 +68,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; 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 static final String MODID = "forgedebugmodelbakeevent"; @@ -95,7 +95,7 @@ public class ModelBakeEventTest } } - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java index 30c17c389a..c35935f07c 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelFluidTest.java @@ -41,7 +41,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 static final String MODID = "forgedebugmodelfluid"; @@ -70,7 +70,7 @@ public class ModelFluidTest public static final Fluid GAS = new TestGas(); - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java index df485c8ef2..a165e9d096 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java @@ -19,66 +19,65 @@ package net.minecraftforge.debug.client.model; +import java.util.ArrayList; +import java.util.List; 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.Matrix4f; import javax.vecmath.Quat4f; import javax.vecmath.Vector3d; 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 static final boolean ENABLED = false; + public static final boolean ENABLED = true; public static final String MODID = "forgedebugmodelloaderregistry"; public static final String VERSION = "1.0"; private static Logger logger; @@ -99,18 +98,28 @@ public class ModelLoaderRegistryTest public static final Block DYNAMIC_EYE = null; @ObjectHolder(OBJCustomDataBlock.name) public static final Block CUSTOM_DATA = null; - - @EventHandler - public void preInit(FMLPreInitializationEvent event) + + @ObjectHolder(OBJTesseractBlock.name) + public static final TileEntityType TESSERACT_TILE = null; + @ObjectHolder(OBJVertexColoring2.name) + public static final TileEntityType VERTEX_COLOR_2_TILE = null; + + public ModelLoaderRegistryTest() { if (!ENABLED) 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 { @net.minecraftforge.eventbus.api.SubscribeEvent @@ -128,8 +137,14 @@ public class ModelLoaderRegistryTest //new OBJDynamicEye(), new OBJCustomDataBlock() ); - GameRegistry.registerTileEntity(OBJTesseractTileEntity.class, OBJTesseractBlock.name); - GameRegistry.registerTileEntity(OBJVertexColoring2TileEntity.class, OBJVertexColoring2.name); + } + + @SubscribeEvent + public static void registerTileEntities(RegistryEvent.Register> 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); } @@ -149,7 +164,7 @@ public class ModelLoaderRegistryTest CUSTOM_DATA }; 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 @@ -169,32 +184,22 @@ public class ModelLoaderRegistryTest //DYNAMIC_EYE, 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 final PropertyDirection FACING = PropertyDirection.create("facing"); + public static final DirectionProperty FACING = BlockStateProperties.FACING; public static final String name = "custom_model_block"; private int counter = 1; private CustomModelBlock() { - super(Material.IRON); - this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(MODID + ":" + name); + super(Properties.create(Material.IRON)); + this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH)); setRegistryName(new ResourceLocation(MODID, name)); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { @@ -208,33 +213,21 @@ public class ModelLoaderRegistryTest } @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 - 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 +/* @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { //Only return an IExtendedBlockState from this method and createState(), otherwise block placement might break! B3DLoader.B3DState newState = new B3DLoader.B3DState(null, counter); return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, newState); } - +*/ @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) { @@ -254,29 +247,9 @@ public class ModelLoaderRegistryTest } @Override - public BlockStateContainer createBlockState() + public void fillStateContainer(StateContainer.Builder builder) { - return new ExtendedBlockState(this, new IProperty[]{FACING}, new IUnlistedProperty[]{Properties.AnimationProperty}); - } - - 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(); + builder.add(FACING); } } @@ -291,30 +264,28 @@ public class ModelLoaderRegistryTest * @author shadekiller666 * */ - public static class OBJTesseractBlock extends Block implements ITileEntityProvider + public static class OBJTesseractBlock extends Block { public static final String name = "obj_tesseract_block"; private OBJTesseractBlock() { - super(Material.IRON); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(MODID + ":" + name); + super(Properties.create(Material.IRON)); setRegistryName(new ResourceLocation(MODID, name)); } - + @Override - public TileEntity createNewTileEntity(World worldIn, int meta) + public boolean hasTileEntity() + { + return true; + } + + @Override + public TileEntity createTileEntity(IBlockState state, IBlockReader world) { return new OBJTesseractTileEntity(); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { @@ -328,7 +299,7 @@ public class ModelLoaderRegistryTest } @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) { @@ -355,7 +326,7 @@ public class ModelLoaderRegistryTest return true; } - @Override +/* @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { 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 state; - } - - @Override - public BlockStateContainer createBlockState() - { - return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{Properties.AnimationProperty}); - } + }*/ } public static class OBJTesseractTileEntity extends TileEntity @@ -402,6 +367,11 @@ public class ModelLoaderRegistryTest return Optional.empty(); } }; + + public OBJTesseractTileEntity() + { + super(TESSERACT_TILE); + } public void increment() { @@ -415,7 +385,7 @@ public class ModelLoaderRegistryTest TextComponentString text = new TextComponentString("" + this.counter); 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); 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() { - super(Material.IRON); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(name); + super(Properties.create(Material.IRON)); setRegistryName(new ResourceLocation(MODID, name)); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { @@ -492,46 +454,26 @@ public class ModelLoaderRegistryTest */ 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"; private OBJDirectionEye() { - super(Material.IRON); - setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(name); + super(Properties.create(Material.IRON)); + setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH)); setRegistryName(new ResourceLocation(MODID, name)); } @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 - public IBlockState getStateFromMeta(int meta) + public void fillStateContainer(StateContainer.Builder builder) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); - } - - @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; + builder.add(FACING); } @Override @@ -545,26 +487,6 @@ public class ModelLoaderRegistryTest { 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 * */ - public static class OBJVertexColoring2 extends Block implements ITileEntityProvider + public static class OBJVertexColoring2 extends Block { public static final String name = "obj_vertex_coloring2"; private OBJVertexColoring2() { - super(Material.IRON); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(name); + super(Properties.create(Material.IRON)); setRegistryName(new ResourceLocation(MODID, name)); } @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(); } @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) { @@ -611,9 +537,10 @@ public class ModelLoaderRegistryTest private List colorList = new ArrayList(); private boolean hasFilledList = false; private boolean shouldIncrement = true; - + public OBJVertexColoring2TileEntity() { + super(VERTEX_COLOR_2_TILE); } public void cycleColors() @@ -678,24 +605,16 @@ public class ModelLoaderRegistryTest */ 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"; private OBJDirectionBlock() { - super(Material.IRON); - this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(MODID + ":" + name); + super(Properties.create(Material.IRON)); + this.setDefaultState(this.getStateContainer().getBaseState().with(FACING, EnumFacing.NORTH)); setRegistryName(new ResourceLocation(MODID, name)); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { @@ -709,47 +628,15 @@ public class ModelLoaderRegistryTest } @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 - public IBlockState getStateFromMeta(int meta) + public void fillStateContainer(StateContainer.Builder builder) { - return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta)); - } - - @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(); + builder.add(FACING); } } @@ -761,55 +648,41 @@ public class ModelLoaderRegistryTest */ public static class OBJCustomDataBlock extends Block { - public static final PropertyBool NORTH = PropertyBool.create("north"); - public static final PropertyBool SOUTH = PropertyBool.create("south"); - public static final PropertyBool WEST = PropertyBool.create("west"); - public static final PropertyBool EAST = PropertyBool.create("east"); + public static final BooleanProperty NORTH = BooleanProperty.create("north"); + public static final BooleanProperty SOUTH = BooleanProperty.create("south"); + public static final BooleanProperty WEST = BooleanProperty.create("west"); + public static final BooleanProperty EAST = BooleanProperty.create("east"); public static final String name = "obj_custom_data_block"; private OBJCustomDataBlock() { - super(Material.IRON); - this.setDefaultState(this.blockState.getBaseState().withProperty(NORTH, false).withProperty(SOUTH, false).withProperty(WEST, false).withProperty(EAST, false)); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(MODID + ":" + name); + super(Properties.create(Material.IRON)); + this.setDefaultState(this.getStateContainer().getBaseState().with(NORTH, false).with(SOUTH, false).with(WEST, false).with(EAST, false)); setRegistryName(new ResourceLocation(MODID, name)); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { return false; } - @Override - public int getMetaFromState(IBlockState state) - { - return 0; - } - - public boolean canConnectTo(IBlockAccess world, BlockPos pos) + public boolean canConnectTo(IBlockReader world, BlockPos pos) { Block block = world.getBlockState(pos).getBlock(); return block instanceof OBJCustomDataBlock; } - + @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 - public BlockStateContainer createBlockState() + protected void fillStateContainer(Builder builder) { - return new BlockStateContainer(this, NORTH, SOUTH, WEST, EAST); + builder.add(NORTH, SOUTH, WEST, EAST); } } @@ -819,30 +692,22 @@ public class ModelLoaderRegistryTest * @author shadekiller666 * */ - public static class OBJDynamicEye extends Block implements ITileEntityProvider + public static class OBJDynamicEye extends Block { public static final String name = "obj_dynamic_eye"; private OBJDynamicEye() { - super(Material.IRON); - setCreativeTab(CreativeTabs.BUILDING_BLOCKS); - setUnlocalizedName(MODID + ":" + name); + super(Properties.create(Material.IRON)); setRegistryName(new ResourceLocation(MODID, name)); } - + @Override - public TileEntity createNewTileEntity(World worldIn, int meta) + public TileEntity createTileEntity(IBlockState state, IBlockReader world) { return new OBJDynamicEyeTileEntity(); } - @Override - public boolean isOpaqueCube(IBlockState state) - { - return false; - } - @Override public boolean isFullCube(IBlockState state) { @@ -855,7 +720,7 @@ public class ModelLoaderRegistryTest return true; } - @Override +/* @Override public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJDynamicEyeTileEntity) @@ -867,26 +732,25 @@ public class ModelLoaderRegistryTest } } 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 OBJDynamicEyeTileEntity() + { + super(null); // TODO + } + private TRSRTransformation transform = TRSRTransformation.identity(); @Override - public void update() + public void tick() { if (this.world.isRemote) { 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(); playerLoc.setX(player.posX); playerLoc.setY(player.posY + player.getEyeHeight()); diff --git a/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java index 1eee6898df..9b83165843 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { private static final boolean ENABLED = true; @@ -47,7 +47,7 @@ public class MultiLayerModelTest @ObjectHolder(blockName) public static final Block TEST_BLOCK = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java index 6feb616fb2..1f7e0d0515 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/FastTESRTransparentTest.java @@ -59,7 +59,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; 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 { @@ -214,7 +214,7 @@ public class FastTESRTransparentTest } }; - @EventBusSubscriber + //@EventBusSubscriber public static class BlockHolder { @@ -253,7 +253,7 @@ public class FastTESRTransparentTest GameRegistry.registerTileEntity(TransparentFastTE.class, MODID + ":fast-tesr-te"); } - @EventBusSubscriber(value = Side.CLIENT, modid = MODID) + //@EventBusSubscriber(value = Side.CLIENT, modid = MODID) public static class ClientLoader { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java index 35e1bdc8d6..8a3eaed779 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/ItemTESRTest.java @@ -47,14 +47,14 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; 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 static final String MODID = "forgedebugitemtile"; @ObjectHolder(TestBlock.name) public static final Block TEST_BLOCK = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java index 94637128fe..05736d557e 100644 --- a/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java +++ b/src/test/java/net/minecraftforge/debug/client/rendering/VertexBufferNormalTest.java @@ -36,7 +36,7 @@ import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.event.FMLPreInitializationEvent; 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 { @Instance("wrnormal") diff --git a/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java index 8336ba7e0d..f3aa2b88b1 100644 --- a/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/BlockEntityUpdateTest.java @@ -28,7 +28,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraftforge.fml.common.Mod; 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 { @Mod.EventHandler diff --git a/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java index 150b01d108..f24bd85ce8 100644 --- a/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/EntityTravelToDimensionEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java b/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java index 30ca8be930..d726dd4ef2 100644 --- a/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/GetCollisionBoxesEventTest.java @@ -42,8 +42,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = GetCollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = GetCollisionBoxesEventTest.MODID, name = "CollisionBoxesEventTest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class GetCollisionBoxesEventTest { public static final String MODID = "collisionboxexeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java index 04f991f295..1ffe48d648 100644 --- a/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/ProjectileImpactEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java index 884f5be350..4c80830999 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/AnimalTameEventTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.event.entity.living.AnimalTameEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class AnimalTameEventTest { static final String MOD_ID = "animal_tame_event_test"; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java index f4a46fc6c5..cb7ffefd58 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/AttackEventTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.logging.log4j.LogManager; 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 { @@ -36,7 +36,7 @@ public class AttackEventTest public static final String NAME = "LivingAttackEventTest"; private static final Logger LOGGER = LogManager.getLogger(NAME); - @EventBusSubscriber + //@EventBusSubscriber public static class LivingAttackEventHandler { diff --git a/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java index c6368bcbc4..7053d4a28e 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/BabyEntitySpawnEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.FMLPreInitializationEvent; 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 static final String MODID = "breedingtest"; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java index 8a11c94e67..f775a12b23 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/CheckSpawnEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = CheckSpawnEventTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = CheckSpawnEventTest.MODID, name = "CheckSpawnTest", version = "1.0", acceptableRemoteVersions = "*") public class CheckSpawnEventTest { public static final String MODID = "checkspawntest"; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java b/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java index 0e438e607a..58e3179685 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/CustomSpawnPlacementTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fml.common.Mod; 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 { static final String MOD_ID = "custom_spawn_placement_test"; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java index 7cfe286462..36d1ecf38c 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/DamageEventTest.java @@ -43,7 +43,7 @@ import net.minecraftforge.fml.event.FMLServerStartingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { @@ -151,7 +151,7 @@ public class DamageEventTest evt.registerServerCommand(new CommandDamage()); } - @EventBusSubscriber + //@EventBusSubscriber public static class TestEventHandler { diff --git a/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java index 8aff5c515b..084d84cf57 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/EquipmentChangeEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java index 9ef6bf1571..3d10942e8d 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/KnockBackEventTest.java @@ -25,8 +25,8 @@ import net.minecraftforge.event.entity.living.LivingKnockBackEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(modid = "kbhtest", name = "Knock Back Hook Test", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = "kbhtest", name = "Knock Back Hook Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class KnockBackEventTest { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java b/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java index 62e9624542..ba90f50bfc 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/MobGriefingEventTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; -@Mod(modid = "entitymobgriefingeventtest", name = "EntityMobGriefingEventTest", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = "entitymobgriefingeventtest", name = "EntityMobGriefingEventTest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class MobGriefingEventTest { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java b/src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java index 45abfd7e63..7d4180df6d 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/SpecialSpawnTest.java @@ -24,8 +24,8 @@ import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = SpecialSpawnTest.MOD_ID, name = "Special Spawn Test", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber(modid = SpecialSpawnTest.MOD_ID) +//@Mod(modid = SpecialSpawnTest.MOD_ID, name = "Special Spawn Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber(modid = SpecialSpawnTest.MOD_ID) public class SpecialSpawnTest { static final String MOD_ID = "special_spawn_test"; diff --git a/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java b/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java index 34754c8f81..96a3135b8a 100644 --- a/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/living/VillagerProfessionTest.java @@ -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.VillagerProfession; -@Mod(modid = "professiontest", name = "ProfessionTest2000", version = "1.0", acceptableRemoteVersions = "*") -@EventBusSubscriber +//@Mod(modid = "professiontest", name = "ProfessionTest2000", version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber public class VillagerProfessionTest { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java index e635332871..af85bbe15c 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/CriticalHitEventTest.java @@ -33,7 +33,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.item.ItemStack; 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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java index 0d02a0e183..52ab4102e7 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/DamageReworkTest.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLInitializationEvent; 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 { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java index 423c00d1f9..d629390ffd 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ItemPickupEventTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { diff --git a/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java index 8580b90d23..a3083fe73d 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerInteractEventTest.java @@ -38,7 +38,7 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = "playerinteracteventtest", name = "PlayerInteractEventTest", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = "playerinteracteventtest", name = "PlayerInteractEventTest", version = "0.0.0", acceptableRemoteVersions = "*") public class PlayerInteractEventTest { // NOTE: Test with both this ON and OFF - ensure none of the test behaviours show when this is off! diff --git a/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java index 1f8ec5d1b4..f518724dd2 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/PlayerSetSpawnTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java b/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java index eeec3ce233..2b192ba2d5 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/ReachDistanceAttributeTest.java @@ -34,8 +34,8 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(modid = ReachDistanceAttributeTest.MODID, name = ReachDistanceAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = ReachDistanceAttributeTest.MODID, name = ReachDistanceAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class ReachDistanceAttributeTest { public static final String MODID = "reachdistanceattributetest"; @@ -46,7 +46,7 @@ public class ReachDistanceAttributeTest evt.getRegistry().register(PLATE); } - @Mod.EventBusSubscriber(Side.CLIENT) + //@Mod.EventBusSubscriber(Side.CLIENT) public static class ClientEvents { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java b/src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java index 27fe422439..ac1723de84 100644 --- a/src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java +++ b/src/test/java/net/minecraftforge/debug/entity/player/SwimSpeedAttributeTest.java @@ -34,8 +34,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; -@Mod(modid = SwimSpeedAttributeTest.MODID, name = SwimSpeedAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = SwimSpeedAttributeTest.MODID, name = SwimSpeedAttributeTest.MODID, version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class SwimSpeedAttributeTest { public static final String MODID = "swimspeedattributetest"; @@ -46,7 +46,7 @@ public class SwimSpeedAttributeTest evt.getRegistry().register(PLATE); } - @Mod.EventBusSubscriber(Side.CLIENT) + //@Mod.EventBusSubscriber(Side.CLIENT) public static class ClientEvents { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java index d04968a77c..601b386b9e 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ColoredFluidTest.java @@ -34,8 +34,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@Mod(modid = ColoredFluidTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*") -@EventBusSubscriber +//@Mod(modid = ColoredFluidTest.MODID, name = "Test Mod", version = "1.0.0", acceptedMinecraftVersions = "*", acceptableRemoteVersions = "*") +//@EventBusSubscriber public class ColoredFluidTest { static final boolean ENABLED = false; // <-- enable mod diff --git a/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java index 68cef43768..535a9e285d 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/CreateFluidSourceEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; 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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java index f149608531..28f5373068 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/DynBucketTest.java @@ -85,7 +85,7 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nonnull; import javax.annotation.Nullable; -@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidTest.MODID, acceptableRemoteVersions = "*") +//@Mod(modid = DynBucketTest.MODID, name = "DynBucketTest", version = "0.1", dependencies = "after:" + ModelFluidTest.MODID, acceptableRemoteVersions = "*") public class DynBucketTest { public static final String MODID = "dynbuckettest"; @@ -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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java index 1ff2fd6aeb..ab4b96417b 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/FluidPlaceBlockEventTest.java @@ -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. * - 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 { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java b/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java index d7f77ca26d..863db62fa8 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/FluidPlacementTest.java @@ -62,7 +62,7 @@ import java.util.List; import static net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack.FLUID_NBT_KEY; -@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION, acceptableRemoteVersions = "*") +//@Mod(modid = FluidPlacementTest.MODID, name = "ForgeDebugFluidPlacement", version = FluidPlacementTest.VERSION, acceptableRemoteVersions = "*") public class FluidPlacementTest { public static final String MODID = "forgedebugfluidplacement"; @@ -70,7 +70,7 @@ public class FluidPlacementTest public static final boolean ENABLE = true; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java index d54dfab04f..3ec933307e 100644 --- a/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java +++ b/src/test/java/net/minecraftforge/debug/fluid/ItemFluidHandlerTest.java @@ -38,7 +38,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; 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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java index 9e9aae5378..4bff353d23 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/AnytimeSleepingTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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 static final String MODID = "anytimesleepingtest"; @@ -58,7 +58,7 @@ public class AnytimeSleepingTest } } - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java index 55b809169a..674e607b32 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/BrewingRecipeRegistryTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = "brewingreciperegistrytest", name = "BrewingRecipeRegistryTest", version = "0.0.0", acceptableRemoteVersions = "*") public class BrewingRecipeRegistryTest { public static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java index e7ff74633a..5f342863ec 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/ConstantLoadingTest.java @@ -33,8 +33,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.server.FMLServerStartedEvent; -@Mod(ConstantLoadingTest.MODID) -@Mod.EventBusSubscriber +//@Mod(ConstantLoadingTest.MODID) +//@Mod.EventBusSubscriber public class ConstantLoadingTest { public static final String MODID = "constantloadingtest"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java b/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java index 94ccbabc26..eba8510ffb 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/CraftingSystemTest.java @@ -35,8 +35,8 @@ import org.apache.logging.log4j.Logger; import java.util.function.BooleanSupplier; -@Mod(modid = CraftingSystemTest.MOD_ID, name = "CraftingTestMod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = CraftingSystemTest.MOD_ID, name = "CraftingTestMod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class CraftingSystemTest { static final String MOD_ID = "crafting_system_test"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java index 36d5189bb3..b8e4c53497 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/DifficultyChangeEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java index 498ac28683..f73a8f6c26 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/DynamicBannerTest.java @@ -44,7 +44,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; // 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 { private static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java index d74a8786f5..cf83b54c1f 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/EnchantmentLevelSetEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 static final boolean ENABLE = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java index 70d76af494..5fcd88123e 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/FurnaceFuelBurnTimeEventTest.java @@ -35,8 +35,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -@Mod(modid = FurnaceFuelBurnTimeEventTest.MOD_ID, name = "Test for FurnaceFuelBurnTimeEvent", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = FurnaceFuelBurnTimeEventTest.MOD_ID, name = "Test for FurnaceFuelBurnTimeEvent", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class FurnaceFuelBurnTimeEventTest { public static final String MOD_ID = "furnacefuelburntimeeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java index e066bc1e96..bd711af6d3 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/GiveItemToPlayerTest.java @@ -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. * 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 { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java index 97042905ca..9031bd47e5 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/InputUpdateEventTest.java @@ -29,12 +29,12 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.InputUpdateEvent; 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 { 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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java index 5f59dfeac4..28fb4b56d7 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/NoBedSleepingTest.java @@ -56,7 +56,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import javax.annotation.Nonnull; 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 static final String MODID = "forgedebugnobedsleeping"; @@ -66,7 +66,7 @@ public class NoBedSleepingTest @ObjectHolder(ItemSleepingPill.name) public static final Item SLEEPING_PILL = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java index 605274d4ce..791b26ebec 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/PotionRegistryTest.java @@ -36,8 +36,10 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; -@Mod.EventBusSubscriber -@Mod(modid = PotionRegistryTest.MOD_ID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*") +import java.util.Random; + +//@Mod.EventBusSubscriber +//@Mod(modid = PotionRegistryTest.MODID, name = "ForgePotionRegistry", version = "1.0", acceptableRemoteVersions = "*") public class PotionRegistryTest { public static final String MOD_ID = "forge_potion_registry"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java index e722a27cb2..39af234b6f 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/RecipeMatchingTest.java @@ -39,7 +39,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 static final String MODID = "recipetest"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java index b138bc2fc4..40b9093177 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementCriterionTest.java @@ -29,8 +29,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -@Mod(name = "advancementcriteriontest", modid = "advancementcriteriontest", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(name = "advancementcriteriontest", modid = "advancementcriteriontest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class AdvancementCriterionTest { private static final PositionTrigger TRIGGER = new PositionTrigger(new ResourceLocation("advancementcriteriontest", "position")); diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java index fb673e9415..7567e8bc97 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementEventTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { static final String MOD_ID = "advancement_event_test"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java index a3a9da4cb7..585e8a305a 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/AdvancementsPaginationTest.java @@ -21,7 +21,7 @@ package net.minecraftforge.debug.gameplay.advancement; import net.minecraftforge.fml.common.Mod; -@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = "advancements_pagination", name = "Advancements Pagination test mod", version = "1.0", acceptableRemoteVersions = "*") public class AdvancementsPaginationTest { } diff --git a/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java b/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java index 67d787fa2e..e63e1c6708 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/advancement/OredictTriggerTest.java @@ -46,8 +46,8 @@ import java.util.Set; * Most of the real work is in the advancements directory of this mod. * This mod tests ore-dict advancement triggers. */ -@Mod.EventBusSubscriber -@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber +//@Mod(modid = OredictTriggerTest.MODID, name = "Oredict Item Predicate Test", version = "1.0", acceptableRemoteVersions = "*") public class OredictTriggerTest { public static final String MODID = "oredict_predicate"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java index f4ef5e19b7..fe4a2557fd 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootContextTweaksTest.java @@ -49,8 +49,8 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.ForgeRegistries; -@EventBusSubscriber -@Mod(modid = LootContextTweaksTest.MODID, name = "LootContextTweaksTest", version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber +//@Mod(modid = LootContextTweaksTest.MODID, name = "LootContextTweaksTest", version = "1.0", acceptableRemoteVersions = "*") public class LootContextTweaksTest { public static final String MODID = "loot_context_tweaks_test"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java index 82a43b9c84..1447d99873 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableLoadEventTest.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLInitializationEvent; 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 static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java index f1baa63ae3..ff3cf5b11b 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/loot/LootTableTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.FMLInitializationEvent; 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 static final String MODID = "loot_table_debug"; diff --git a/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java index 6b9ab732b1..2bc34fd076 100644 --- a/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java +++ b/src/test/java/net/minecraftforge/debug/item/BonemealEventTest.java @@ -28,7 +28,7 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.apache.logging.log4j.Logger; -@Mod(modid = BonemealEventTest.MODID, name = "Bonemeal Event Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = BonemealEventTest.MODID, name = "Bonemeal Event Test", version = "1.0", acceptableRemoteVersions = "*") public class BonemealEventTest { public static final String MODID = "bonemealeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java b/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java index d5df49a281..b1ccec8d3b 100644 --- a/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java +++ b/src/test/java/net/minecraftforge/debug/item/CanApplyAtEnchantingTableTest.java @@ -30,7 +30,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; 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 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 { @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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java b/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java index 2e9f7a2ee1..a6ba5ba422 100644 --- a/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java +++ b/src/test/java/net/minecraftforge/debug/item/CanDestroyBlocksInCreativeTest.java @@ -29,13 +29,13 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; 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 static final boolean ENABLE = true; public static final String MODID = "item_can_destroy_blocks_in_creative_test"; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java b/src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java index 02c02db268..89c1017ea8 100644 --- a/src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ContinuousUseItemTest.java @@ -38,8 +38,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -@Mod(modid = ContinuousUseItemTest.MOD_ID, name = "Test for canContinueUsing", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = ContinuousUseItemTest.MOD_ID, name = "Test for canContinueUsing", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class ContinuousUseItemTest { static final String MOD_ID = "continuous_use_item_test"; diff --git a/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java index 50861c17c5..4d3e7367b9 100644 --- a/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java +++ b/src/test/java/net/minecraftforge/debug/item/HorseArmorTest.java @@ -37,8 +37,8 @@ import net.minecraftforge.fml.common.Mod.EventBusSubscriber; import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@EventBusSubscriber -@Mod(modid = HorseArmorTest.MODID, name = "HorseArmorTest", version = "1.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber +//@Mod(modid = HorseArmorTest.MODID, name = "HorseArmorTest", version = "1.0", acceptableRemoteVersions = "*") public class HorseArmorTest { 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")); } - @EventBusSubscriber(modid = MODID, value = Side.CLIENT) + //@EventBusSubscriber(modid = MODID, value = Side.CLIENT) public static class ClientEventHandler { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java b/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java index d8f7b2d93e..381f112ef8 100644 --- a/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java +++ b/src/test/java/net/minecraftforge/debug/item/IsBookEnchantableTest.java @@ -29,8 +29,8 @@ import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; -@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = IsBookEnchantableTest.MOD_ID, name = "Test for isBookEnchantable", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class IsBookEnchantableTest { 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 { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java index 1976c699ec..726af4bea1 100644 --- a/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ItemFishedEventTest.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; 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 { diff --git a/src/test/java/net/minecraftforge/debug/item/MapDataTest.java b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java index 78056b8439..bf662dce09 100644 --- a/src/test/java/net/minecraftforge/debug/item/MapDataTest.java +++ b/src/test/java/net/minecraftforge/debug/item/MapDataTest.java @@ -59,7 +59,7 @@ import javax.annotation.Nullable; import java.io.IOException; 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 { @GameRegistry.ObjectHolder("mapdatatest:custom_map") diff --git a/src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java b/src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java index 32860230a7..b96e14b77b 100644 --- a/src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java +++ b/src/test/java/net/minecraftforge/debug/item/MendingRepairTest.java @@ -33,8 +33,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; -@Mod.EventBusSubscriber -@Mod(modid = MendingRepairTest.MOD_ID, name = "Mending repair amount test mod", version = "1.0") +//@Mod.EventBusSubscriber +//@Mod(modid = MendingRepairTest.MOD_ID, name = "Mending repair amount test mod", version = "1.0") public class MendingRepairTest { static final boolean ENABLED = true; diff --git a/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java b/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java index d09cbb83e7..fb08333b7b 100644 --- a/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java +++ b/src/test/java/net/minecraftforge/debug/item/NBTShareTagTest.java @@ -38,7 +38,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; 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 static final String MODID = "nbtsharetagitemtest"; @@ -46,7 +46,7 @@ public class NBTShareTagTest @ObjectHolder("nbt_share_tag_item") public static final Item TEST_ITEM = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java b/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java index bde1bf5991..2097843f0d 100644 --- a/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java +++ b/src/test/java/net/minecraftforge/debug/item/OnItemUseFirstTest.java @@ -35,8 +35,8 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import javax.annotation.Nonnull; -@Mod(modid = OnItemUseFirstTest.MODID, name = "OnItemUseFirstTest", version = "0.0.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = OnItemUseFirstTest.MODID, name = "OnItemUseFirstTest", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class OnItemUseFirstTest { public static final boolean ENABLE = true; diff --git a/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java b/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java index 6a4a14fef3..f37726728e 100644 --- a/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/item/PotionCurabilityTest.java @@ -46,7 +46,7 @@ import java.util.List; * 3. Drink incurable_potion from Brewing creative tab * 4. Relog to test that changes to curative items persist, then try drinking milk and eating medicine: they should have no effect */ -@Mod(modid = 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 static final boolean ENABLED = false; @@ -56,7 +56,7 @@ public class PotionCurabilityTest public static final Item MEDICINE = null; private static Potion INCURABLE_POTION; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @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 { @SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java index de04411b6c..ee6db95f87 100644 --- a/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java +++ b/src/test/java/net/minecraftforge/debug/item/PotionShouldRenderTest.java @@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.FMLPreInitializationEvent; 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 static final String modID = "nopotioneffect"; diff --git a/src/test/java/net/minecraftforge/debug/item/ShieldTest.java b/src/test/java/net/minecraftforge/debug/item/ShieldTest.java index bd5f6eee07..e31347eb4b 100644 --- a/src/test/java/net/minecraftforge/debug/item/ShieldTest.java +++ b/src/test/java/net/minecraftforge/debug/item/ShieldTest.java @@ -41,8 +41,8 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraftforge.api.distmarker.Dist; @ObjectHolder("shield_test") -@EventBusSubscriber -@Mod(modid = "shield_test", name = "Shield Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@EventBusSubscriber +//@Mod(modid = "shield_test", name = "Shield Test", version = "0.0.0", acceptableRemoteVersions = "*") public class ShieldTest { public static final ItemShield DIAMOND_SHIELD = null; diff --git a/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java index 76be0fd6a1..f514daefdb 100644 --- a/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java +++ b/src/test/java/net/minecraftforge/debug/misc/EnumPlantTypeTest.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@Mod("enumplanttypetest") +//@Mod("enumplanttypetest") public class EnumPlantTypeTest { private static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java index b78a3e2593..f20bef82e2 100644 --- a/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/CapabilityTest.java @@ -50,7 +50,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; 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 { // A Holder/Marker for if this capability is installed. diff --git a/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java index 165bf2793c..bf2ba48a61 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ClientLoadingExceptionTest.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.event.FMLLoadCompleteEvent; import net.minecraftforge.fml.event.FMLPreInitializationEvent; 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 { diff --git a/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java index 0287d4d8f1..29d0e8611d 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ConfigAnnotationTest.java @@ -41,7 +41,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -@Mod(modid = ConfigAnnotationTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = ConfigAnnotationTest.MODID, name = "ConfigTest", version = "1.0", acceptableRemoteVersions = "*") public class ConfigAnnotationTest { public static final String MODID = "config_test"; diff --git a/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java index 9aed9e5098..c3ed3db29b 100644 --- a/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/ObjectHolderAnnotationTest.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.RegistryBuilder; -@Mod(modid = ObjectHolderAnnotationTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = ObjectHolderAnnotationTest.MODID, name = "ObjectHolderTests", version = "1.0", acceptableRemoteVersions = "*") public class ObjectHolderAnnotationTest { public static final String MODID = "objectholdertest"; @@ -64,7 +64,7 @@ public class ObjectHolderAnnotationTest } } - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java index 251e889e51..bb6dd16839 100644 --- a/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/PermissionTest.java @@ -40,7 +40,7 @@ import net.minecraftforge.server.permission.PermissionAPI; import net.minecraftforge.server.permission.context.BlockPosContext; import net.minecraftforge.server.permission.context.ContextKey; -@Mod(modid = PermissionTest.MOD_ID, name = "PermissionTest", version = "1.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = PermissionTest.MOD_ID, name = "PermissionTest", version = "1.0.0", acceptableRemoteVersions = "*") public class PermissionTest { public static final String MOD_ID = "permission_test"; diff --git a/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java b/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java index 204f9d0408..2227cc8b40 100644 --- a/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java +++ b/src/test/java/net/minecraftforge/debug/mod/RegistryOverrideTest.java @@ -38,8 +38,8 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(modid = RegistryOverrideTest.MODID, name = "Registry override test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = RegistryOverrideTest.MODID, name = "Registry override test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class RegistryOverrideTest { public static final String MODID = "registry_override_test"; diff --git a/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java index d9fef665de..b9435d4995 100644 --- a/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java +++ b/src/test/java/net/minecraftforge/debug/network/BigNetworkMessageTest.java @@ -30,8 +30,8 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -@Mod(modid = BigNetworkMessageTest.MOD_ID, name = "Big network message test mod", version = "1.0", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = BigNetworkMessageTest.MOD_ID, name = "Big network message test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class BigNetworkMessageTest { static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java index e387292676..24863f089f 100644 --- a/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java +++ b/src/test/java/net/minecraftforge/debug/network/TrackingTargetTest.java @@ -40,8 +40,8 @@ import java.util.Collections; import java.util.Set; import java.util.WeakHashMap; -@Mod(modid = TrackingTargetTest.ID, name = "Tracking Target Test", acceptableRemoteVersions = "*") -@Mod.EventBusSubscriber +//@Mod(modid = TrackingTargetTest.ID, name = "Tracking Target Test", acceptableRemoteVersions = "*") +//@Mod.EventBusSubscriber public class TrackingTargetTest { public static final String ID = "trackingtargettest"; diff --git a/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java b/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java index f5032f9f3e..786e15d2cf 100644 --- a/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java +++ b/src/test/java/net/minecraftforge/debug/util/ModNameTooltip.java @@ -31,8 +31,8 @@ import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.ModContainer; -@Mod(modid = "forgemodnametooltip", name = "ForgeModNameTooltip", version = "1.0", clientSideOnly = true) -@Mod.EventBusSubscriber(Side.CLIENT) +//@Mod(modid = "forgemodnametooltip", name = "ForgeModNameTooltip", version = "1.0", clientSideOnly = true) +//@Mod.EventBusSubscriber(Side.CLIENT) public class ModNameTooltip { @net.minecraftforge.eventbus.api.SubscribeEvent(priority = net.minecraftforge.eventbus.api.EventPriority.LOW) diff --git a/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java b/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java index c79ee7ee56..f310f897fe 100644 --- a/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java +++ b/src/test/java/net/minecraftforge/debug/util/RotatingWrench.java @@ -40,7 +40,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; -@Mod(modid = RotatingWrench.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = RotatingWrench.modID, name = "Wrench Rotate Debug", version = "0.0.0", acceptableRemoteVersions = "*") public class RotatingWrench { public static final String modID = "wrenchrotatedebug"; @@ -49,7 +49,7 @@ public class RotatingWrench public static final Item TEST_WRENCH = null; - @Mod.EventBusSubscriber(modid = modID) + //@Mod.EventBusSubscriber(modid = modID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java index 53c96ce7b7..93f55bf71c 100644 --- a/src/test/java/net/minecraftforge/debug/util/TextureDumper.java +++ b/src/test/java/net/minecraftforge/debug/util/TextureDumper.java @@ -36,7 +36,7 @@ import java.io.IOException; import java.nio.IntBuffer; // TODO 1.13: implement without java.awt -@Mod(modid = TextureDumper.MODID, name = "Forge Texture Atlas Dump", version = TextureDumper.VERSION, clientSideOnly = true) +//@Mod(modid = TextureDumper.MODID, name = "Forge Texture Atlas Dump", version = TextureDumper.VERSION, clientSideOnly = true) public class TextureDumper { public static final String MODID = "forge_texture_dump"; diff --git a/src/test/java/net/minecraftforge/debug/village/MerchantTradeOffersEventTest.java b/src/test/java/net/minecraftforge/debug/village/MerchantTradeOffersEventTest.java index 330a3dc477..0d58329174 100644 --- a/src/test/java/net/minecraftforge/debug/village/MerchantTradeOffersEventTest.java +++ b/src/test/java/net/minecraftforge/debug/village/MerchantTradeOffersEventTest.java @@ -33,7 +33,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; * Tests {@link MerchantTradeOffersEvent}. When enabled, the item that the villager sells to * the player will be maxed out in stack size. */ -@Mod(modid = MerchantTradeOffersEventTest.MODID, name = MerchantTradeOffersEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = MerchantTradeOffersEventTest.MODID, name = MerchantTradeOffersEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*") public class MerchantTradeOffersEventTest { public static final String MODID = "merchanttradeofferseventtest"; diff --git a/src/test/java/net/minecraftforge/debug/village/VillageSiegeEventTest.java b/src/test/java/net/minecraftforge/debug/village/VillageSiegeEventTest.java index bbf23c0371..4e59cffd3e 100644 --- a/src/test/java/net/minecraftforge/debug/village/VillageSiegeEventTest.java +++ b/src/test/java/net/minecraftforge/debug/village/VillageSiegeEventTest.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; * Tests {@link VillageSiegeEvent}. When enabled, players holding a diamond sword in the mainhand * slot are not counted in determining where the zombie siege occurs. */ -@Mod(modid = VillageSiegeEventTest.MODID, name = VillageSiegeEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = VillageSiegeEventTest.MODID, name = VillageSiegeEventTest.NAME, version = "0.0.0", acceptableRemoteVersions = "*") public class VillageSiegeEventTest { public static final String MODID = "villagesiegeeventtest"; diff --git a/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java index 561cb2da81..1baf574841 100644 --- a/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/world/ChunkCapabilityTest.java @@ -47,7 +47,7 @@ import javax.annotation.Nullable; * Simple mod to test chunk capabilities. * Use flint and steel to increase pollution in a chunk and saplings to decrease pollution in a chunk. */ -@Mod(modid = ChunkCapabilityTest.MODID, name = "Chunk Capability Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = ChunkCapabilityTest.MODID, name = "Chunk Capability Test", version = "0.0.0", acceptableRemoteVersions = "*") public class ChunkCapabilityTest { public static final String MODID = "chunkcapabilitypollutiontest"; diff --git a/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java index a484a69a41..cb641fdb47 100644 --- a/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java +++ b/src/test/java/net/minecraftforge/debug/world/ChunkWatchEventTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = ChunkWatchEventTest.MODID, name = "Chunk Watch Event Test", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = ChunkWatchEventTest.MODID, name = "Chunk Watch Event Test", version = "1.0", acceptableRemoteVersions = "*") public class ChunkWatchEventTest { public static final String MODID = "chunkwatchworldtest"; diff --git a/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java index b9a5a080e8..9c47d41e29 100644 --- a/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/world/DecorateEventDebug.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.event.FMLInitializationEvent; import net.minecraftforge.eventbus.api.Event.Result; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(modid = DecorateEventDebug.MODID, name = DecorateEventDebug.NAME, version = DecorateEventDebug.VERSION, acceptableRemoteVersions = "*") +//@Mod(modid = DecorateEventDebug.MODID, name = DecorateEventDebug.NAME, version = DecorateEventDebug.VERSION, acceptableRemoteVersions = "*") public class DecorateEventDebug { diff --git a/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java b/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java index 0766c3c932..00bfd2a9f2 100644 --- a/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java +++ b/src/test/java/net/minecraftforge/debug/world/SpawnDimensionTest.java @@ -27,7 +27,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = SpawnDimensionTest.MODID, name = "CustomSpawnDimensionTest", version = "0.1", acceptableRemoteVersions = "*") +//@Mod(modid = SpawnDimensionTest.MODID, name = "CustomSpawnDimensionTest", version = "0.1", acceptableRemoteVersions = "*") public class SpawnDimensionTest { public static final String MODID = "customspawndimensiontest"; diff --git a/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java index 728d66da88..0f18ce2454 100644 --- a/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java +++ b/src/test/java/net/minecraftforge/debug/world/TileEntityLoadingTest.java @@ -43,7 +43,7 @@ import org.apache.logging.log4j.Logger; import javax.annotation.Nullable; import java.util.Collections; -@Mod(modid = TileEntityLoadingTest.MODID, name = "TileEntity#onLoad() test mod", version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = TileEntityLoadingTest.MODID, name = "TileEntity#onLoad() test mod", version = "1.0", acceptableRemoteVersions = "*") public class TileEntityLoadingTest { public static final boolean ENABLED = false; @@ -54,7 +54,7 @@ public class TileEntityLoadingTest @ObjectHolder(TestBlock.NAME) private static final Block TEST_BLOCK = null; - @Mod.EventBusSubscriber(modid = MODID) + //@Mod.EventBusSubscriber(modid = MODID) public static class Registration { @net.minecraftforge.eventbus.api.SubscribeEvent @@ -73,7 +73,7 @@ public class TileEntityLoadingTest } } - @Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) + //@Mod.EventBusSubscriber(value = Side.CLIENT, modid = MODID) public static class ClientEventHandler { @net.minecraftforge.eventbus.api.SubscribeEvent diff --git a/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java index 0b07901524..283486f9e8 100644 --- a/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java +++ b/src/test/java/net/minecraftforge/debug/world/WorldCapabilityTest.java @@ -43,7 +43,7 @@ import javax.annotation.Nullable; /** * Simple mod to test world capability, by adding timer logic and check for raining time. */ -@Mod(modid = WorldCapabilityTest.MODID, name = "World Periodic Rain Check Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = WorldCapabilityTest.MODID, name = "World Periodic Rain Check Test", version = "0.0.0", acceptableRemoteVersions = "*") public class WorldCapabilityTest { public static final String MODID = "worldperiodicrainchecktest"; diff --git a/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java index be7a99a4a6..e348897e10 100644 --- a/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java +++ b/src/test/java/net/minecraftforge/debug/world/WorldProviderCanSleepAtTest.java @@ -29,7 +29,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLPreInitializationEvent; -@Mod(modid = WorldProviderCanSleepAtTest.MODID, name = "Can Sleep At Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = WorldProviderCanSleepAtTest.MODID, name = "Can Sleep At Test", version = "0.0.0", acceptableRemoteVersions = "*") public class WorldProviderCanSleepAtTest { public static final String MODID = "can_sleep_at_test"; diff --git a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java index 80a1a61182..640a9ad5a8 100644 --- a/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java +++ b/src/test/java/net/minecraftforge/fml/test/ForgeNetworkTestMod.java @@ -34,7 +34,7 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.internal.FMLProxyPacket; import net.minecraftforge.api.distmarker.Dist; -@Mod(modid = ForgeNetworkTestMod.MOD_ID, name = ForgeNetworkTestMod.MOD_ID, version = "1.0", acceptableRemoteVersions = "*") +//@Mod(modid = ForgeNetworkTestMod.MOD_ID, name = ForgeNetworkTestMod.MOD_ID, version = "1.0", acceptableRemoteVersions = "*") public class ForgeNetworkTestMod { private static final boolean ENABLED = false; diff --git a/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java b/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java index c911c14f94..8f14ed925c 100644 --- a/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java +++ b/src/test/java/net/minecraftforge/fml/test/SpecialSpawnEventTest.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLPreInitializationEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -@Mod(modid = SpecialSpawnEventTest.MOD_ID, version = "1.0", acceptableRemoteVersions="*") +//@Mod(modid = SpecialSpawnEventTest.MOD_ID, version = "1.0", acceptableRemoteVersions="*") public class SpecialSpawnEventTest { private static final boolean ENABLED = false; public static final String MOD_ID = "spawnerduratest"; diff --git a/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java b/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java index b5e061f4f1..82ea88dcfd 100644 --- a/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java +++ b/src/test/java/net/minecraftforge/test/SelectorHandlerTest.java @@ -31,7 +31,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.event.FMLInitializationEvent; -@Mod(modid = "selectorhandlertest", name = "Selector Handler Test", version = "0.0.0", acceptableRemoteVersions = "*") +//@Mod(modid = "selectorhandlertest", name = "Selector Handler Test", version = "0.0.0", acceptableRemoteVersions = "*") public class SelectorHandlerTest { @EventHandler diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index 843de44dba..407174d112 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -2,84 +2,9 @@ modLoader="javafml" # A version range to match for said mod loader loaderVersion="[2.0,)" -# A URL to query for updates -updateJSONURL="http://myurl.me/" -# A URL to refer people to when problems occur with this mod -issueTrackerURL="http://my.issue.tracker/" -# Extra mod loader property -randomScalaProperty="fishy" -# Arbitrary key-value property pairs available to mods -[properties] -key="value" -# A list of mods - how many allowed here is determined by the individual mod loader +# debug/client/model [[mods]] - # The modid of the mod - modId="inventorysorter" - # The version number of the mod - version="1.1" - # A display name for the mod - displayName="Inventory Sorter" - # The description text for the mod (multi line!) - description=''' - This is my mod, there may be - others, but this one is mine - ''' - # A random extra property for a mod loader - randomExtraProperty="somevalue" - # Arbitrary key-value pairs - [modproperties.inventorysorter] - key="value" - # A list of dependencies - [[dependencies.inventorysorter]] - # the modid of the dependency - modId="forge" - # Does this dependency have to exist - if not, ordering below must be specified - mandatory=true - # The version range of the dependency - versionRange="[14.23.2.0,)" - # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory - ordering="NONE" - # Side this dependency is applied on - BOTH, CLIENT or SERVER - side="BOTH" - # Here's another dependency - [[dependencies.inventorysorter]] - modId="minecraft" - mandatory=true - versionRange="[1.12.2]" - ordering="NONE" - side="BOTH" -# Here's another mod in this jar -[[mods]] - # Note that other mod types may want to add additional key-value pairs in here - modId="inventorysortertoo" - # ${jarVersion} will read the Implementation-Version of the jar file - version="${jarVersion}" - displayName="Inventory Sorter as well" - description=''' - This is also my mod, there may be - others, but this one is mine - ''' - [[dependencies.inventorysortertoo]] - modId="minecraft" - mandatory=true - versionRange="[1.12.2]" - ordering="NONE" - side="BOTH" -[[mods]] - # A minimal mod - modId="minimalmod" -# debug/misc -[[mods]] - modId="enumplanttypetest" + modId="forgedebugmodelloaderregistry" version="1.0" - displayName="EnumPlantTypeTest" -# debug/chat -[[mods]] - modId="command_event_test" - version="1.0" - displayName="CommandEventTest" -[[mods]] - modId="entity_selector_test" - version="1.0" - displayName="EntitySelectorTest" + displayName="ModelLoaderRegistryTest" diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/custom_model_block.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/custom_model_block.json index ced7cffd1c..ee9d41488e 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/custom_model_block.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/custom_model_block.json @@ -11,10 +11,6 @@ } }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - }], "facing": { "down": {"x": 90}, "up": {"x": 270}, diff --git a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_custom_data_block.json b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_custom_data_block.json index 579728323c..e6af6f30ae 100644 --- a/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_custom_data_block.json +++ b/src/test/resources/assets/forgedebugmodelloaderregistry/blockstates/obj_custom_data_block.json @@ -6,13 +6,6 @@ //"custom": {"show": ["post"]} }, "variants": { - "normal": [{}], - "inventory": [{ - "transform": "forge:default-block" - /*"custom": { - "show": ["post"] - }*/ - }], "north": { "true": { "model": "forgedebugmodelloaderregistry:fancy_fence.obj" diff --git a/src/test/resources/pack.mcmeta b/src/test/resources/pack.mcmeta new file mode 100644 index 0000000000..352b341c54 --- /dev/null +++ b/src/test/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 4, + "description": "Forge tests resource pack" + } +} \ No newline at end of file