From 0faf118536442770a6a8701d5485a2f537679367 Mon Sep 17 00:00:00 2001 From: BrockWS Date: Wed, 28 Nov 2018 14:40:17 +1100 Subject: [PATCH] Initial CurseForge Release for 1.12.2 --- README.md | 4 ++-- .../ThaumicEnergistics.java | 19 ++++++++----------- .../part/ContainerSharedEssentiaBus.java | 1 + src/main/resources/pack.mcmeta | 10 +++++----- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 3e956e2e..f80d5847 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # ThaumicEnergistics *Because the digital age could use some magic!* -[![Build Status](https://ci.brock.pw/job/Thaumic%20Energistics/badge/icon)](https://ci.brock.pw/job/Thaumic%20Energistics/) +[![Build Status](https://ci.brock.pw/job/Thaumic%20Energistics%20RV6/badge/icon)](https://ci.brock.pw/job/Thaumic%20Energistics%20RV6/) ### Please note that this mod is currently in alpha for 1.12.2. The following versions are required for this mod: @@ -41,7 +41,7 @@ How To Contribute --- ## Code Format -Code formatting is pretty simple, just keep to defaults. No tabs, use 4 spaces instead +Code formatting is pretty simple, just keep to defaults. No tabs, use 4 spaces instead. ## Compile diff --git a/src/main/java/thaumicenergistics/ThaumicEnergistics.java b/src/main/java/thaumicenergistics/ThaumicEnergistics.java index 5b18142d..a28ee3b7 100644 --- a/src/main/java/thaumicenergistics/ThaumicEnergistics.java +++ b/src/main/java/thaumicenergistics/ThaumicEnergistics.java @@ -114,21 +114,18 @@ public void postInit(FMLPostInitializationEvent event) { @Mod.EventHandler public void serverLoad(FMLServerStartingEvent event) { - event.registerServerCommand(new CommandAddVis()); + //event.registerServerCommand(new CommandAddVis()); } @SubscribeEvent public void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) { - // TODO: Temporary alpha warning - TextComponentString s1 = new TextComponentString( - "Thaumic Energistics is currently in alpha, things may be broken, not implemented or cause lost items and world corruption.\n" + - "Post issues to GitHub" - ); - s1.getStyle().setColor(TextFormatting.RED); - TextComponentString link = new TextComponentString("https://github.com/Nividica/ThaumicEnergistics"); - link.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Nividica/ThaumicEnergistics")).setColor(TextFormatting.GOLD); - - event.player.sendMessage(s1.appendSibling(link)); + //Temporary alpha warning + //TextComponentString s1 = new TextComponentString("Thaumic Energistics is currently in alpha. Post issues to GitHub"); + //s1.getStyle().setColor(TextFormatting.RED); + //TextComponentString link = new TextComponentString("https://github.com/Nividica/ThaumicEnergistics"); + //link.getStyle().setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Nividica/ThaumicEnergistics")).setColor(TextFormatting.GOLD); + // + //event.player.sendMessage(s1.appendSibling(link)); } @SubscribeEvent diff --git a/src/main/java/thaumicenergistics/container/part/ContainerSharedEssentiaBus.java b/src/main/java/thaumicenergistics/container/part/ContainerSharedEssentiaBus.java index 72a461eb..b1c9d997 100644 --- a/src/main/java/thaumicenergistics/container/part/ContainerSharedEssentiaBus.java +++ b/src/main/java/thaumicenergistics/container/part/ContainerSharedEssentiaBus.java @@ -62,6 +62,7 @@ public boolean isItemValid(ItemStack stack) { @Override public void detectAndSendChanges() { // TODO: Send filter updates? + this.sendFilter(); this.recalculateSlots(); super.detectAndSendChanges(); } diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index e53eb534..0fad6988 100755 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ -{ - "pack": { - "pack_format": 1, - "description": "Resources used for Thaumic Energistics" - } +{ + "pack": { + "pack_format": 3, + "description": "Resources used for Thaumic Energistics" + } } \ No newline at end of file