diff --git a/build.gradle.kts b/build.gradle.kts index 0d6826d..c659e31 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,4 +9,4 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -version = "0.2.0.1" +version = "0.2.0.2" diff --git a/src/main/java/com/nao7016/ClayiumAdditions/client/ClientProxy.java b/src/main/java/com/nao7016/ClayiumAdditions/client/ClientProxy.java index 778eeb6..4f1450f 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/client/ClientProxy.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/client/ClientProxy.java @@ -21,6 +21,7 @@ public void init(FMLInitializationEvent event) { super.init(event); MinecraftForgeClient.registerItemRenderer(CAItems.storageBox, new StorageRenderer()); MinecraftForgeClient.registerItemRenderer(CAItems.clayStorageBox, new StorageRenderer()); + MinecraftForgeClient.registerItemRenderer(CAItems.miningStorageBox, new StorageRenderer()); StorageKey.set(); if (!(Loader.isModLoaded("inventorytweaks") || Loader.isModLoaded("VeinMiner") diff --git a/src/main/java/com/nao7016/ClayiumAdditions/common/CommonProxy.java b/src/main/java/com/nao7016/ClayiumAdditions/common/CommonProxy.java index 87cec3d..6008bdc 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/common/CommonProxy.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/common/CommonProxy.java @@ -10,11 +10,13 @@ import com.nao7016.ClayiumAdditions.compat.nei.NEIPluginClayiumAdditions; import com.nao7016.ClayiumAdditions.event.HammerEvent; import com.nao7016.ClayiumAdditions.event.MiningHammerEvent; +import com.nao7016.ClayiumAdditions.event.PlayerLogin; import com.nao7016.ClayiumAdditions.item.storagebox.AutoCollect; import com.nao7016.ClayiumAdditions.network.CANetwork; import com.nao7016.ClayiumAdditions.recipe.CARecipes; import com.nao7016.ClayiumAdditions.util.UtilAddTier; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -47,6 +49,9 @@ public void init(FMLInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new HammerEvent()); MinecraftForge.EVENT_BUS.register(new MiningHammerEvent()); MinecraftForge.EVENT_BUS.register(new AutoCollect()); + FMLCommonHandler.instance() + .bus() + .register(new PlayerLogin()); if (Loader.isModLoaded("NotEnoughItems")) { NEIPluginClayiumAdditions.registerNEI(); diff --git a/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumAdditionsCatalyst.java b/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumAdditionsCatalyst.java deleted file mode 100644 index f332cc5..0000000 --- a/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumAdditionsCatalyst.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.nao7016.ClayiumAdditions.compat.nei; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import com.nao7016.ClayiumAdditions.common.CAItems; -import com.nao7016.ClayiumAdditions.common.Config; - -import codechicken.nei.recipe.CatalystInfo; -import codechicken.nei.recipe.RecipeCatalysts; - -@Deprecated -public class NEIClayiumAdditionsCatalyst { - - public static void registerHammerCatalysts() { - if (Config.cfgModeSky) { - registerCatalysts("ClayHammer", CAItems.clayHammer); - } - } - - public static void registerCatalysts(String handlerId, Block[] blocks) { - for (Block block : blocks) { - registerCatalysts(handlerId, block); - } - } - - public static void registerCatalysts(String handlerId, Block block) { - if (block != null) { - Item item = Item.getItemFromBlock(block); - registerCatalysts(handlerId, item); - } - } - - public static void registerCatalysts(String handlerId, Item[] items) { - for (Item item : items) { - registerCatalysts(handlerId, item); - } - } - - public static void registerCatalysts(String handlerId, Item item) { - if (item != null) { - RecipeCatalysts.addRecipeCatalyst(handlerId, new CatalystInfo(new ItemStack(item), 0)); - } - } -} diff --git a/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumCatalyst.java b/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumCatalyst.java deleted file mode 100644 index 1d43553..0000000 --- a/src/main/java/com/nao7016/ClayiumAdditions/compat/nei/NEIClayiumCatalyst.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.nao7016.ClayiumAdditions.compat.nei; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import com.nao7016.ClayiumAdditions.common.AddMachines; -import com.nao7016.ClayiumAdditions.common.Config; - -import codechicken.nei.recipe.CatalystInfo; -import codechicken.nei.recipe.RecipeCatalysts; -import mods.clayium.block.CBlocks; - -@Deprecated -public class NEIClayiumCatalyst { - - public static void registerMachineCatalysts() { - // tier 0 - registerCatalysts("ClayWorkTable", CBlocks.blockClayWorkTable); - registerCatalysts("crafting", CBlocks.blockClayCraftingTable); - - // tier 1 - registerCatalysts("BendingMachine", CBlocks.blocksBendingMachine); - registerCatalysts("WireDrawingMachine", CBlocks.blocksWireDrawingMachine); - registerCatalysts("PipeDrawingMachine", CBlocks.blocksPipeDrawingMachine); - registerCatalysts("CuttingMachine", CBlocks.blocksCuttingMachine); - registerCatalysts("Lathe", CBlocks.blocksLathe); - registerCatalysts("MillingMachine", CBlocks.blockElementalMillingMachine); - registerCatalysts("MillingMachine", CBlocks.blocksMillingMachine); - registerCatalysts("CobblestoneGenerator", CBlocks.blocksCobblestoneGenerator); - - // tier 2 - registerCatalysts("Condenser", CBlocks.blocksCondenser); - registerCatalysts("Grinder", CBlocks.blocksGrinder); - registerCatalysts("Decomposer", CBlocks.blocksDecomposer); - - // tier 3 - registerCatalysts("Assembler", CBlocks.blocksAssembler); - registerCatalysts("Centrifuge", CBlocks.blocksCentrifuge); - registerCatalysts("Inscriber", CBlocks.blocksInscriber); - registerCatalysts("ECCondenser", CBlocks.blockEnergeticClayCondenser); - registerCatalysts("ECCondenser", CBlocks.blockEnergeticClayCondenserMK2); - - // tier 4 - registerCatalysts("Smelter", CBlocks.blocksSmelter); - registerCatalysts("ChemicalReactor", CBlocks.blocksChemicalReactor); - registerCatalysts("SaltExtractor", CBlocks.blocksSaltExtractor); - - // tier 5 - registerCatalysts("QuartzCrucible", CBlocks.blockQuartzCrucible); - registerCatalysts("SolarClayFabricator", CBlocks.blockSolarClayFabricatorMK1); - registerCatalysts("SolarClayFabricator", CBlocks.blockSolarClayFabricatorMK2); - registerCatalysts("SolarClayFabricator", CBlocks.blockLithiumSolarClayFabricator); - - // tier 6 - registerCatalysts("BlastFurnace", CBlocks.blockClayBlastFurnace); - registerCatalysts("AlloySmelter", CBlocks.blocksAlloySmelter); - registerCatalysts("ChemicalMetalSeparator", CBlocks.blockChemicalMetalSeparator); - registerCatalysts("ElectrolysisReactor", CBlocks.blocksElectrolysisReactor); - - // tier 7 - registerCatalysts("Reactor", CBlocks.blockClayReactor); - registerCatalysts("ClayTree", CBlocks.blocksClayEnergyLaser); - registerCatalysts("ClayTree", CBlocks.blockClayTreeLog); - - // tier 9 - registerCatalysts("MatterTransformer", CBlocks.blocksTransformer); - registerCatalysts("CACondenser", CBlocks.blocksCACondenser); - - // tier 10 - registerCatalysts("CAInjector", CBlocks.blocksCAInjector); - registerCatalysts("CAReactor", CBlocks.blocksCAReactorCore); - - // tier 13 - registerCatalysts("ECDecomposer", CBlocks.blockEnergeticClayDecomposer); - - if (Config.cfgAddMachines) { - // tier 1 - registerCatalysts("BendingMachine", AddMachines.blocksAddBendingMachine); - registerCatalysts("WireDrawingMachine", AddMachines.blocksAddWireDrawingMachine); - registerCatalysts("PipeDrawingMachine", AddMachines.blocksAddPipeDrawingMachine); - registerCatalysts("CuttingMachine", AddMachines.blocksAddCuttingMachine); - registerCatalysts("Lathe", AddMachines.blocksAddLathe); - registerCatalysts("MillingMachine", AddMachines.blocksAddMillingMachine); - registerCatalysts("CobblestoneGenerator", AddMachines.blocksAddCobblestoneGenerator); - - // tier 2 - registerCatalysts("Condenser", AddMachines.blocksAddCondenser); - registerCatalysts("Grinder", AddMachines.blocksAddGrinder); - registerCatalysts("Decomposer", AddMachines.blocksAddDecomposer); - - // tier 3 - registerCatalysts("Assembler", AddMachines.blocksAddAssembler); - registerCatalysts("Centrifuge", AddMachines.blocksAddCentrifuge); - registerCatalysts("Inscriber", AddMachines.blocksAddInscriber); - - // tier 4 - registerCatalysts("Smelter", AddMachines.blocksAddSmelter); - registerCatalysts("ChemicalReactor", AddMachines.blocksAddChemicalReactor); - registerCatalysts("SaltExtractor", AddMachines.blocksAddSaltExtractor); - - // tier 6 - registerCatalysts("ElectrolysisReactor", AddMachines.blocksAddElectrolysisReactor); - - // tier 9 - registerCatalysts("MatterTransformer", AddMachines.blocksAddTransformer); - registerCatalysts("CACondenser", AddMachines.blocksAddCACondenser); - } - - // registerCatalysts("", CBlocks.blocks); - - } - - public static void registerCatalysts(String handlerId, Block[] blocks) { - for (Block block : blocks) { - registerCatalysts(handlerId, block); - } - } - - public static void registerCatalysts(String handlerId, Block block) { - if (block != null) { - Item item = Item.getItemFromBlock(block); - registerCatalysts(handlerId, item); - } - - } - - public static void registerCatalysts(String handlerId, Item item) { - if (item != null) { - RecipeCatalysts.addRecipeCatalyst(handlerId, new CatalystInfo(new ItemStack(item), 0)); - } - } -} diff --git a/src/main/java/com/nao7016/ClayiumAdditions/event/PlayerLogin.java b/src/main/java/com/nao7016/ClayiumAdditions/event/PlayerLogin.java new file mode 100644 index 0000000..5fa2280 --- /dev/null +++ b/src/main/java/com/nao7016/ClayiumAdditions/event/PlayerLogin.java @@ -0,0 +1,27 @@ +package com.nao7016.ClayiumAdditions.event; + +import java.util.Calendar; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; + +public class PlayerLogin { + + @SubscribeEvent + public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + EntityPlayer player = event.player; + if (player == null) return; + + Calendar calendar = Calendar.getInstance(); + int month = calendar.get(Calendar.MONTH) + 1; + int day = calendar.get(Calendar.DAY_OF_MONTH); + + if (month == 1 && day <= 3) { + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chat.new_year.greeting"))); + } + } +} diff --git a/src/main/resources/assets/clayiumadditions/lang/en_US.lang b/src/main/resources/assets/clayiumadditions/lang/en_US.lang index 711835f..378d10e 100644 --- a/src/main/resources/assets/clayiumadditions/lang/en_US.lang +++ b/src/main/resources/assets/clayiumadditions/lang/en_US.lang @@ -221,5 +221,7 @@ recipe.ClayHammer=Clay Hammer key.clayiumadditions.storagebox=Storage / Pull +chat.new_year.greeting=Happy New Year! May you enjoy Clayium this year too! + itemGroup.clayiumAdditionsTabs=Clayium Additions diff --git a/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang b/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang index 05cc7f8..a71a628 100644 --- a/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang +++ b/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang @@ -221,5 +221,7 @@ recipe.ClayHammer=粘土ハンマー key.clayiumadditions.storagebox=収納 / 取り出し +chat.new_year.greeting=あけましておめでとうございます！ 今年もClayiumを楽しめますように！ + itemGroup.clayiumAdditionsTabs=Clayium Additions diff --git a/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang b/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang index a7e59f6..5a8b2ff 100644 --- a/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang +++ b/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang @@ -221,5 +221,7 @@ recipe.ClayHammer=Clay Hammer key.clayiumadditions.storagebox=Storage / Pull +chat.new_year.greeting=Happy New Year! May you enjoy Clayium this year too! + itemGroup.clayiumAdditionsTabs=粘土工业附加 diff --git a/src/main/resources/assets/nei/csv/handlers.csv.disabled b/src/main/resources/assets/nei/csv/handlers.csv.disabled deleted file mode 100644 index 9edea8c..0000000 --- a/src/main/resources/assets/nei/csv/handlers.csv.disabled +++ /dev/null @@ -1,39 +0,0 @@ -handler,modName,itemName,nbtInfo,modId,modRequired,excludedModId,yShift,handlerHeight,handlerWidth,maxRecipesPerPage,imageResource,imageX,imageY,imageWidth,imageHeight,itemNotes -codechicken.nei.recipe.BrewingRecipeHandler,Minecraft,minecraft:brewing_stand,,minecraft,false,,,65,166,5,,,,,, -codechicken.nei.recipe.FireworkRecipeHandler,Minecraft,minecraft:fireworks,,minecraft,false,,,65,166,5,,,,,, -codechicken.nei.recipe.FurnaceRecipeHandler,Minecraft,minecraft:furnace,,minecraft,false,,,65,166,5,,,,,, -codechicken.nei.recipe.ShapedRecipeHandler,Minecraft,minecraft:crafting_table,,minecraft,false,,,65,166,5,,,,,, -codechicken.nei.recipe.ShapelessRecipeHandler,Minecraft,minecraft:crafting_table,,minecraft,false,,,65,166,5,,,,,, -codechicken.nei.recipe.FuelRecipeHandler,Minecraft,,,minecraft,false,,,65,166,5,nei:textures/nei_tabbed_sprites.png,80,0,14,14, -ClayWorkTable,Clayium,clayium:blockClayWorkTable,,clayium,true,,,65,166,5,,,,,, -BendingMachine,Clayium,clayium:blockBasicBendingMachine,,clayium,true,,,65,166,5,,,,,, -WireDrawingMachine,Clayium,clayium:blockBasicWireDrawingMachine,,clayium,true,,,65,166,5,,,,,, -PipeDrawingMachine,Clayium,clayium:blockBasicPipeDrawingMachine,,clayium,true,,,65,166,5,,,,,, -CuttingMachine,Clayium,clayium:blockBasicCuttingMachine,,clayium,true,,,65,166,5,,,,,, -Lathe,Clayium,clayium:blockBasicLathe,,clayium,true,,,65,166,5,,,,,, -MillingMachine,Clayium,clayium:blockBasicMillingMachine,,clayium,true,,,65,166,5,,,,,, -CobblestoneGenerator,Clayium,clayium:blockBasicCobblestoneGenerator,,clayium,true,,,65,166,5,,,,,, -Condenser,Clayium,clayium:blockBasicCondenser,,clayium,true,,,65,166,5,,,,,, -Grinder,Clayium,clayium:blockBasicGrinder,,clayium,true,,,65,166,5,,,,,, -Decomposer,Clayium,clayium:blockBasicDecomposer,,clayium,true,,,65,166,5,,,,,, -Assembler,Clayium,clayium:blockBasicAssembler,,clayium,true,,,65,166,5,,,,,, -Centrifuge,Clayium,clayium:blockBasicCentrifuge,,clayium,true,,,65,166,5,,,,,, -Inscriber,Clayium,clayium:blockBasicInscriber,,clayium,true,,,65,166,5,,,,,, -ECCondenser,Clayium,clayium:blockEnergeticClayCondenserMK2,,clayium,true,,,65,166,5,,,,,, -Smelter,Clayium,clayium:blockBasicSmelter,,clayium,true,,,65,166,5,,,,,, -ChemicalReactor,Clayium,clayium:blockBasicChemicalReactor,,clayium,true,,,65,166,5,,,,,, -SaltExtractor,Clayium,clayium:blockBasicSaltExtractor,,clayium,true,,,65,166,5,,,,,, -QuartzCrucible,Clayium,clayium:blockQuartzCrucible,,clayium,true,,,65,166,5,,,,,, -SolarClayFabricator,Clayium,clayium:blockSolarClayFabricatorMK1,,clayium,true,,,65,166,5,,,,,, -BlastFurnace,Clayium,clayium:blockClayBlastFurnace,,clayium,true,,,65,166,5,,,,,, -AlloySmelter,Clayium,clayium:blockBasicSmelter,,clayium,true,,,65,166,5,,,,,, -ChemicalMetalSeparator,Clayium,clayium:blockChemicalMetalSeparator,,clayium,true,,,65,166,5,,,,,, -ElectrolysisReactor,Clayium,clayium:blockPrecisionElectrolysisReactor,,clayium,true,,,65,166,5,,,,,, -Reactor,Clayium,clayium:blockClayReactor,,clayium,true,,,65,166,5,,,,,, -ClayTree,Clayium,clayium:blockClayTreeSapling,,clayium,true,,,65,166,5,,,,,, -MatterTransformer,Clayium,clayium:blockClaySteelTransformer,,clayium,true,,,65,166,5,,,,,, -CACondenser,Clayium,clayium:itemGems:800,,clayium,true,,,65,166,5,,,,,, -CAInjector,Clayium,clayium:blockAntimatterCAInjector,,clayium,true,,,65,166,5,,,,,, -CAReactor,Clayium,clayium:itemGems:801,,clayium,true,,,65,166,5,,,,,, -ECDecomposer,Clayium,clayium:blockEnergeticClayDecomposer,,clayium,true,,,65,166,5,,,,,, -ClayHammer,Clayium Additions,clayiumadditions:clay_hammer,,clayiumadditions,true,,,65,166,5,,,,,,