diff --git a/src/main/java/com/tom/storagemod/StorageMod.java b/src/main/java/com/tom/storagemod/StorageMod.java index c21c0feb..a51186df 100644 --- a/src/main/java/com/tom/storagemod/StorageMod.java +++ b/src/main/java/com/tom/storagemod/StorageMod.java @@ -17,11 +17,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import com.tom.storagemod.block.BlockOpenCrate; @@ -57,11 +53,11 @@ public StorageMod() { // Register the setup method for modloading FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); // Register the enqueueIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); // Register the processIMC method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); // Register the doClientStuff method for modloading - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); + //FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); // Register ourselves for server and other game events we are interested in MinecraftForge.EVENT_BUS.register(this); @@ -70,12 +66,11 @@ public StorageMod() { private void setup(final FMLCommonSetupEvent event) { // some preinit code - //LOGGER.info("HELLO FROM PREINIT"); - //LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName()); + LOGGER.info("Tom's Storage Setup starting"); proxy.setup(); } - private void doClientStuff(final FMLClientSetupEvent event) { + /*private void doClientStuff(final FMLClientSetupEvent event) { // do something that can only be done on the client //LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().gameSettings); proxy.clientSetup(); @@ -91,16 +86,17 @@ private void enqueueIMC(final InterModEnqueueEvent event) private void processIMC(final InterModProcessEvent event) { // some example code to receive and process InterModComms from other mods - /*LOGGER.info("Got IMC {}", event.getIMCStream(). + LOGGER.info("Got IMC {}", event.getIMCStream(). map(m->m.getMessageSupplier().get()). - collect(Collectors.toList()));*/ - } + collect(Collectors.toList())); + }*/ // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent + + /*@SubscribeEvent public void onServerStarting(FMLServerStartingEvent event) { // do something when the server starts //LOGGER.info("HELLO from server starting"); - } + }*/ // You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD // Event bus for receiving Registry Events) diff --git a/src/main/resources/data/toms_storage/loot_tables/blocks/ts.inventory_connector.json b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.inventory_connector.json new file mode 100644 index 00000000..f0a7c4ae --- /dev/null +++ b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.inventory_connector.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "toms_storage:ts.inventory_connector" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/toms_storage/loot_tables/blocks/ts.open_crate.json b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.open_crate.json new file mode 100644 index 00000000..8b0d5b3d --- /dev/null +++ b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.open_crate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "toms_storage:ts.open_crate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/toms_storage/loot_tables/blocks/ts.storage_terminal.json b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.storage_terminal.json new file mode 100644 index 00000000..01c18869 --- /dev/null +++ b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.storage_terminal.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "toms_storage:ts.storage_terminal" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/toms_storage/loot_tables/blocks/ts.trim.json b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.trim.json new file mode 100644 index 00000000..5be1df35 --- /dev/null +++ b/src/main/resources/data/toms_storage/loot_tables/blocks/ts.trim.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "toms_storage:ts.trim" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/version-check.json b/version-check.json index 0d3e37c6..7abe54b2 100644 --- a/version-check.json +++ b/version-check.json @@ -1,10 +1,11 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/toms-storage", "promos": { - "1.15.2-latest": "1.0.0", - "1.15.2-recommended": "1.0.0" + "1.15.2-latest": "1.0.1", + "1.15.2-recommended": "1.0.1" }, "1.15.2": { + "1.0.1": "Fixed loot tables", "1.0.0": "First release" } }