From 86fa0e5065aebf66acae4a05e8be6aa1b620fb62 Mon Sep 17 00:00:00 2001 From: Eternal130 <111716703+Eternal130@users.noreply.github.com> Date: Sun, 7 Jan 2024 23:46:03 +0800 Subject: [PATCH 1/2] Fix recipes bug: Re-add recipes that were mistakenly not added; Modify recipes of LED vuMeter and Analog vuMeter to allow crafting with all types of planks instead of just 4 types; Add recipes for the following items: Voltage controlled amplifier, Thermistor, Low Current Relay, Medium Current Relay, High Current Relay, Multicolor LED vuMeter, Rolling Shaft Machine, Crank Shaft, Animal Filter, Christmas Tree (only available during Christmas), Holiday Candle (only available during Christmas), String Lights (only available during Christmas) --- src/main/java/mods/eln/Eln.java | 22 ++--- .../kotlin/mods/eln/craft/CraftingRecipes.kt | 88 +++++++++++++++---- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/src/main/java/mods/eln/Eln.java b/src/main/java/mods/eln/Eln.java index f2ffa84a..664227f4 100644 --- a/src/main/java/mods/eln/Eln.java +++ b/src/main/java/mods/eln/Eln.java @@ -329,15 +329,15 @@ public void preInit(FMLPreInitializationEvent event) { elnNetwork = NetworkRegistry.INSTANCE.newSimpleChannel("electrical-age"); elnNetwork.registerMessage(AchievePacketHandler.class, AchievePacket.class, 0, Side.SERVER); elnNetwork.registerMessage(TransparentNodeRequestPacketHandler.class, TransparentNodeRequestPacket.class, 1, -Side.SERVER); - elnNetwork.registerMessage(TransparentNodeResponsePacketHandler.class, TransparentNodeResponsePacket.class, 2 - , Side.CLIENT); + Side.SERVER); + elnNetwork.registerMessage(TransparentNodeResponsePacketHandler.class, TransparentNodeResponsePacket.class, 2, + Side.CLIENT); elnNetwork.registerMessage(GhostNodeWailaRequestPacketHandler.class, GhostNodeWailaRequestPacket.class, 3, Side.SERVER); elnNetwork.registerMessage(GhostNodeWailaResponsePacketHandler.class, GhostNodeWailaResponsePacket.class, 4, Side.CLIENT); elnNetwork.registerMessage(SixNodeWailaRequestPacketHandler.class, SixNodeWailaRequestPacket.class, 5, -Side.SERVER); + Side.SERVER); elnNetwork.registerMessage(SixNodeWailaResponsePacketHandler.class, SixNodeWailaResponsePacket.class, 6, Side.CLIENT); @@ -390,16 +390,16 @@ public void preInit(FMLPreInitializationEvent event) { arcMetalBlock = new ArcMetalBlock(); sharedItem = - (SharedItem) new SharedItem().setCreativeTab(creativeTab).setMaxStackSize(64).setUnlocalizedName("sharedItem"); + (SharedItem) new SharedItem().setCreativeTab(creativeTab).setMaxStackSize(64).setUnlocalizedName("sharedItem"); sharedItemStackOne = - (SharedItem) new SharedItem().setCreativeTab(creativeTab).setMaxStackSize(1).setUnlocalizedName( - "sharedItemStackOne"); + (SharedItem) new SharedItem().setCreativeTab(creativeTab).setMaxStackSize(1).setUnlocalizedName( + "sharedItemStackOne"); transparentNodeBlock = (TransparentNodeBlock) new TransparentNodeBlock(Material.iron, - TransparentNodeEntity.class).setCreativeTab(creativeTab).setBlockTextureName("iron_block"); + TransparentNodeEntity.class).setCreativeTab(creativeTab).setBlockTextureName("iron_block"); sixNodeBlock = - (SixNodeBlock) new SixNodeBlock(Material.plants, SixNodeEntity.class).setCreativeTab(creativeTab).setBlockTextureName("iron_block"); + (SixNodeBlock) new SixNodeBlock(Material.plants, SixNodeEntity.class).setCreativeTab(creativeTab).setBlockTextureName("iron_block"); ghostBlock = (GhostBlock) new GhostBlock().setBlockTextureName("iron_block"); lightBlock = new LightBlock(); @@ -448,7 +448,7 @@ public void modsLoaded(FMLPostInitializationEvent event) { if (Other.ccLoaded) { PeripheralHandler.register(); } - CraftingRecipes.INSTANCE.recipeMaceratorModOres(); + CraftingRecipes.INSTANCE.itemCrafting(); } @EventHandler @@ -465,7 +465,7 @@ public void load(FMLInitializationEvent event) { FMLCommonHandler.instance().bus().register(new ElnFMLEventsHandler()); MinecraftForge.EVENT_BUS.register(this); FMLInterModComms.sendMessage("Waila", "register", "mods.eln.integration.waila.WailaIntegration" + - ".callbackRegister"); + ".callbackRegister"); Utils.println("Electrical age init done"); } diff --git a/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt b/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt index 4e0fbe52..5b9f74fe 100644 --- a/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt +++ b/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt @@ -18,6 +18,8 @@ import net.minecraft.launchwrapper.LogWrapper import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.oredict.ShapedOreRecipe import net.minecraftforge.oredict.ShapelessOreRecipe +import java.util.* +import kotlin.collections.HashSet object CraftingRecipes { @@ -116,6 +118,14 @@ object CraftingRecipes { recipeECoal() recipeGridDevices(Eln.oreNames) + recipeMaceratorModOres() + craftBrush() + val cal: Calendar = Calendar.getInstance() + val month: Int = cal.get(Calendar.MONTH) + 1 + val day: Int = cal.get(Calendar.DAY_OF_MONTH) + if(month == 12 && day == 25) { + recipeChristmas() + } checkRecipe() } @@ -370,6 +380,10 @@ object CraftingRecipes { findItemStack("Power Resistor"), " ", "cCc", " ", 'c', findItemStack("Copper Cable"), 'C', findItemStack("Coal Dust") ) + addRecipe( + findItemStack("Thermistor"), " ", "cCc", " ", 'c', findItemStack("Copper Cable"), 'C', + findItemStack("Copper Ingot") + ) addRecipe( findItemStack("Rheostat"), " R ", " MS", "cmc", 'R', findItemStack("Power Resistor"), 'c', findItemStack("Copper Cable"), 'm', findItemStack("Machine Block"), 'M', findItemStack("Electrical Motor"), @@ -434,6 +448,24 @@ object CraftingRecipes { findItemStack("Iron Cable"), 'G', ItemStack(Blocks.glass_pane), 'I', findItemStack("Copper Cable"), 'C', findItemStack("Signal Cable") ) + addRecipe( + findItemStack("Low Current Relay"), "GGG", "OIO", "CRC", 'R', ItemStack(Items.redstone), 'O', + findItemStack("Iron Cable"), 'G', ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack( + "Copper Cable" + ), 'C', findItemStack("Low Current Cable") + ) + addRecipe( + findItemStack("Medium Current Relay"), "GGG", "OIO", "CRC", 'R', ItemStack(Items.redstone), 'O', + findItemStack("Iron Cable"), 'G', ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack( + "Copper Cable" + ), 'C', findItemStack("Medium Current Cable") + ) + addRecipe( + findItemStack("High Current Relay"), "GGG", "OIO", "CRC", 'R', ItemStack(Items.redstone), 'O', + findItemStack("Iron Cable"), 'G', ItemStack(Blocks.glass_pane), 'A', "itemRubber", 'I', findItemStack( + "Copper Cable" + ), 'C', findItemStack("High Current Cable") + ) } private fun recipeWirelessSignal() { @@ -511,6 +543,10 @@ object CraftingRecipes { findItemStack("Amplifier"), " r", "cCc", " ", 'r', ItemStack(Items.redstone), 'c', findItemStack("Copper Cable"), 'C', Eln.dictAdvancedChip ) + addRecipe( + findItemStack("Voltage controlled amplifier"), " sr", "cCc", " ", 'r', ItemStack(Items.redstone), 'c', + findItemStack("Copper Cable"), 'C', Eln.dictAdvancedChip, 's', findItemStack("Signal Cable") + ) addRecipe( findItemStack("OpAmp"), " r", "cCc", " c ", 'r', ItemStack(Items.redstone), 'c', findItemStack("Copper Cable"), 'C', Eln.dictAdvancedChip @@ -610,6 +646,7 @@ object CraftingRecipes { ), 'M', findItemStack("Advanced Machine Block") ) addRecipe(findItemStack("Joint"), " ", "iii", " m ", 'i', "ingotIron", 'm', findItemStack("Machine Block")) + addRecipe(findItemStack("Crank Shaft"), " i", "iii", " m ", 'i', "ingotIron", 'm', findItemStack("Machine Block")) addRecipe( findItemStack("Joint hub"), " i ", "iii", " m ", 'i', "ingotIron", 'm', findItemStack( "Machine " + @@ -638,6 +675,10 @@ object CraftingRecipes { "Machine Block" ) ) + addRecipe( + findItemStack("Rolling Shaft Machine"), "IiI", "IcI", "IiI", 'i', "ingotIron", 'I', "plateIron", 'c', findItemStack( + "Machine Block") + ) } private fun recipeBattery() { @@ -1365,6 +1406,10 @@ object CraftingRecipes { findItemStack("Monster Filter"), " g", "gc", " g", 'g', ItemStack(Blocks.glass_pane), 'c', ItemStack(Items.dye, 1, 1) ) + addRecipe( + findItemStack("Animal Filter"), " g", "gc", " g", 'g', ItemStack(Blocks.glass_pane), 'c', + ItemStack(Items.dye, 1, 4) + ) addRecipe(Eln.findItemStack("Casing", 1), "ppp", "p p", "ppp", 'p', findItemStack("Iron Cable")) addRecipe(findItemStack("Iron Clutch Plate"), " t ", "tIt", " t ", 'I', "plateIron", 't', Eln.dictTungstenDust) addRecipe(findItemStack("Gold Clutch Plate"), " t ", "tGt", " t ", 'G', "plateGold", 't', Eln.dictTungstenDust) @@ -1780,7 +1825,7 @@ object CraftingRecipes { ) //hardcoded 7MJ to prevent overunity } - public fun recipeMaceratorModOres() { + private fun recipeMaceratorModOres() { val f = 4000f recipeMaceratorModOre(f * 3f, "oreCertusQuartz", "dustCertusQuartz", 3) recipeMaceratorModOre(f * 1.5f, "crystalCertusQuartz", "dustCertusQuartz", 1) @@ -2106,23 +2151,21 @@ object CraftingRecipes { } private fun recipeElectricalVuMeter() { - for (idx in 0..3) { - addRecipe( - Eln.findItemStack("Analog vuMeter", 1), "WWW", "RIr", "WSW", 'W', ItemStack( - Blocks.planks, 1, - idx - ), 'R', ItemStack(Items.redstone), 'I', findItemStack("Iron Cable"), 'r', ItemStack( - Items.dye, - 1, 1 - ), 'S', findItemStack("Signal Cable") - ) - } - for (idx in 0..3) { - addRecipe( - Eln.findItemStack("LED vuMeter", 1), " W ", "WTW", " S ", 'W', ItemStack(Blocks.planks, 1, idx), - 'T', ItemStack(Blocks.redstone_torch), 'S', findItemStack("Signal Cable") - ) - } + addRecipe( + Eln.findItemStack("Analog vuMeter", 1), "WWW", "RIr", "WSW", 'W', "plankWood", + 'R', ItemStack(Items.redstone), 'I', findItemStack("Iron Cable"), 'r', ItemStack( + Items.dye, + 1, 1 + ), 'S', findItemStack("Signal Cable") + ) + addRecipe( + Eln.findItemStack("LED vuMeter", 1), " W ", "WTW", " S ", 'W', "plankWood", + 'T', ItemStack(Blocks.redstone_torch), 'S', findItemStack("Signal Cable") + ) + addRecipe( + Eln.findItemStack("Multicolor LED vuMeter", 1), " W ", "WRW", " S ", 'W', "plankWood", + 'R', ItemStack(Items.redstone), 'S', findItemStack("Signal Cable") + ) } private fun recipeElectricalBreaker() { @@ -2368,6 +2411,13 @@ object CraftingRecipes { ReplicatorEntity.dropList.add(ItemStack(Items.glowstone_dust)) // EntityRegistry.addSpawn(ReplicatorEntity.class, 1, 1, 2, EnumCreatureType.monster, BiomeGenBase.plains); } - + private fun recipeChristmas(){ + addShapelessRecipe(Eln.findItemStack("Christmas Tree", 1), findItemStack("String Lights"), ItemStack(Blocks.sapling, 1, 1), findItemStack("String Lights")) + addRecipe( + Eln.findItemStack("Holiday Candle", 1), " g ", "gbg", " i ", 'g', ItemStack(Blocks.glass_pane), 'b', + findItemStack("200V LED Bulb"), 'i', "ingotIron" + ) + addShapelessRecipe(Eln.findItemStack("String Lights", 2), findItemStack("200V LED Bulb"), "materialString") + } } \ No newline at end of file From e5b0b5bf2494a44a45e1cf6d6bdbb60d934de9a2 Mon Sep 17 00:00:00 2001 From: Eternal130 <111716703+Eternal130@users.noreply.github.com> Date: Tue, 9 Apr 2024 22:26:27 +0800 Subject: [PATCH 2/2] Change the opening time for the recipes of Christmas items to December. --- src/main/kotlin/mods/eln/craft/CraftingRecipes.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt b/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt index 5b9f74fe..6a54a59e 100644 --- a/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt +++ b/src/main/kotlin/mods/eln/craft/CraftingRecipes.kt @@ -122,8 +122,7 @@ object CraftingRecipes { craftBrush() val cal: Calendar = Calendar.getInstance() val month: Int = cal.get(Calendar.MONTH) + 1 - val day: Int = cal.get(Calendar.DAY_OF_MONTH) - if(month == 12 && day == 25) { + if(month == 12 ) { recipeChristmas() }