From bfbb4a0cff74411f61f9a079bf62798e2829398f Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 16 Mar 2021 18:16:12 +0300 Subject: [PATCH] Lucernia door & trapdoor, campfire recipes --- .../blocks/complex/MetalMaterial.java | 20 +++++++++--------- .../ru/betterend/recipe/CraftingRecipes.java | 1 + .../recipe/builders/FurnaceRecipe.java | 18 ++++++++++++++-- .../textures/block/lucernia_door_bottom.png | Bin 0 -> 258 bytes .../textures/block/lucernia_door_side.png | Bin 0 -> 212 bytes .../textures/block/lucernia_door_top.png | Bin 0 -> 257 bytes .../textures/block/lucernia_trapdoor.png | Bin 0 -> 249 bytes .../betterend/textures/item/lucernia_door.png | Bin 0 -> 211 bytes 8 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_door_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_door_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_door_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/lucernia_trapdoor.png create mode 100644 src/main/resources/assets/betterend/textures/item/lucernia_door.png diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 4c1b5c68..bb7f6041 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java @@ -141,7 +141,7 @@ public class MetalMaterial { boots = EndItems.registerItem(name + "_boots", new EndArmorItem(armor, EquipmentSlot.FEET, itemSettings)); if (hasOre) { - FurnaceRecipe.make(name + "_ingot_furnace", ore, ingot).setGroup("end_ingot").build(true); + FurnaceRecipe.make(name + "_ingot_furnace", ore, ingot).setGroup("end_ingot").buildWithBlasting(); AlloyingRecipe.Builder.create(name + "_ingot_alloy").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build(); } @@ -166,15 +166,15 @@ public class MetalMaterial { GridRecipe.make(name + "_chandelier", chandelier).setShape("I#I", " # ").addMaterial('#', ingot).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").build(); // Tools & armor into nuggets - FurnaceRecipe.make(name + "_axe_nugget", axe, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_hoe_nugget", hoe, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_pickaxe_nugget", pickaxe, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_sword_nugget", sword, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_hammer_nugget", hammer, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_helmet_nugget", helmet, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_chestplate_nugget", chestplate, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_leggings_nugget", leggings, nugget).setGroup("end_nugget").build(true); - FurnaceRecipe.make(name + "_boots_nugget", boots, nugget).setGroup("end_nugget").build(true); + FurnaceRecipe.make(name + "_axe_nugget", axe, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_hoe_nugget", hoe, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_pickaxe_nugget", pickaxe, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_sword_nugget", sword, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_hammer_nugget", hammer, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_helmet_nugget", helmet, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_chestplate_nugget", chestplate, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_leggings_nugget", leggings, nugget).setGroup("end_nugget").buildWithBlasting(); + FurnaceRecipe.make(name + "_boots_nugget", boots, nugget).setGroup("end_nugget").buildWithBlasting(); // Tool parts from ingots AnvilRecipe.Builder.create(name + "_shovel_head").setInput(ingot).setOutput(shovelHead).setAnvilLevel(level).setToolLevel(level).setDamage(level).build(); diff --git a/src/main/java/ru/betterend/recipe/CraftingRecipes.java b/src/main/java/ru/betterend/recipe/CraftingRecipes.java index c4cd844c..7fe05063 100644 --- a/src/main/java/ru/betterend/recipe/CraftingRecipes.java +++ b/src/main/java/ru/betterend/recipe/CraftingRecipes.java @@ -188,6 +188,7 @@ public class CraftingRecipes { GridRecipe.make("charcoal_block", EndBlocks.CHARCOAL_BLOCK).setShape("###", "###", "###").addMaterial('#', Items.CHARCOAL).build(); GridRecipe.make("end_stone_furnace", EndBlocks.END_STONE_FURNACE).setShape("###", "# #", "###").addMaterial('#', Blocks.END_STONE).build(); + GridRecipe.make("filalux_lantern", EndBlocks.FILALUX_LANTERN).setShape("###", "###", "###").addMaterial('#', EndBlocks.FILALUX).build(); } private static void registerLantern(String name, Block lantern, Block slab) { diff --git a/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java b/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java index b56d8e9a..1a672be8 100644 --- a/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java +++ b/src/main/java/ru/betterend/recipe/builders/FurnaceRecipe.java @@ -3,6 +3,7 @@ package ru.betterend.recipe.builders; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.recipe.BlastingRecipe; +import net.minecraft.recipe.CampfireCookingRecipe; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; @@ -59,10 +60,18 @@ public class FurnaceRecipe { } public void build() { - build(false); + build(false, false); } - public void build(boolean blasting) { + public void buildWithBlasting() { + build(true, false); + } + + public void buildWithCampfire() { + build(false, true); + } + + public void build(boolean blasting, boolean campfire) { if (exist) { Identifier id = BetterEnd.makeID(name); SmeltingRecipe recipe = new SmeltingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time); @@ -72,6 +81,11 @@ public class FurnaceRecipe { BlastingRecipe recipe2 = new BlastingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time / 2); EndRecipeManager.addRecipe(RecipeType.BLASTING, recipe2); } + + if (campfire) { + CampfireCookingRecipe recipe2 = new CampfireCookingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time / 2); + EndRecipeManager.addRecipe(RecipeType.CAMPFIRE_COOKING, recipe2); + } } else { BetterEnd.LOGGER.debug("Smelting recipe {} couldn't be added", name); diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_door_bottom.png b/src/main/resources/assets/betterend/textures/block/lucernia_door_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..8f126ea8b7c6b8fbb98d2ca7414aa7a4a985355c GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0LS@ ztvlD;YMrCQK0oi1VS!h&6CN}b?Ed`I5h%w|666=m@E-!Mo(eGnsrPho43U_s+Rw?y zpvb|j`Si#C{_+B0<&pzU7iaFC{Ed6AA;a~e>DKDaQ>u8a>K}O9qzYbZ&|dkfMAqZL zj*MN?XUwyIqiJ6db+^A~F=IyIitURftT`U^XemFPa;|wn$eC5=%5Ukt-EjQT>UsmE x28&&{eq56Ce1GllG}GC(A8zjC)P1#*|Gy6N=DxQPw}9?p@O1TaS?83{1OQ>pXN&*< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_door_side.png b/src/main/resources/assets/betterend/textures/block/lucernia_door_side.png new file mode 100644 index 0000000000000000000000000000000000000000..8ecca09ecbd8cf1ed776fb44f01fde1d59c99a24 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|`aE46Lo9le z_e`4m;s3R*>^zqiHSvVY?MqQ$n=yNZ;hw5LvmAZGrZm2M{kq>J^AOv+-jzT zgg~GZ*8&ZxiLs|!WK@?lHFmp+FoQ+6F)m?B31?=A$ko}W@5R>$bQy!EtDnm{r-UW| DR*y=i literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_door_top.png b/src/main/resources/assets/betterend/textures/block/lucernia_door_top.png new file mode 100644 index 0000000000000000000000000000000000000000..53164a59f6687547e9cfc72ce39cf3ef411bab89 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0LS@ ztvlD;YMrCQK0oi1VS!h&6CN}b?Ed`I5h%w|666=m@E-!Mo(eGniZy$>IEF|}_3e)o za#7@9R!rRazc>E%nf579g%)&9JT>>t%yW@)3nTMSh80S(o}8@Umzln%dXCbi%l8!G z%Sz|ZofVMvd{1}WDW-cWJ}WFEyS7C?Ojx;DHhEzv3(p#h7tZ?}HSNNDesV9}d+2gg w!)o?j;=g)Wtqw_St2@@P?Tmd)Y5z6$(*?}-Pm|8K0-eL)>FVdQ&MBb@0BD+I?*IS* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/lucernia_trapdoor.png b/src/main/resources/assets/betterend/textures/block/lucernia_trapdoor.png new file mode 100644 index 0000000000000000000000000000000000000000..286a1f3b5227f8f58b07b431087a6c77aea40ae0 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0LS@ ztvlD;YMrCQK0oi1VS!h&6CN}b?Ed`I5h%w|666=m@E-!Mo(eGnidB2MIEF|}P4&OX zci4f$N#y5$d%5ddUT&IM?O-Vqpp%~&zSWO;-R;A9eg}jU`6pV%hZdZ+zT_jZRj^LG zD}!lILZFMXzJm8=|GUgS+p{`Kxazf<51iebZm^Yi^7@vKiPx?Neg2>G=h%ZYsXDxR n`?r6ctn~0p+hxx0!vC4id}mIz)haUpI)lN})z4*}Q$iB}8wXz$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/lucernia_door.png b/src/main/resources/assets/betterend/textures/item/lucernia_door.png new file mode 100644 index 0000000000000000000000000000000000000000..9f0a205a98c53945fa58f3495ef455ed2e90a919 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~i2$DvS0LS@ ztvlD;YMrCQK0oi1VS!h&6CN}b?Ed`I5h%w|666=m@E-!Mo(eGniiLW*IEF|}?d^9I zaxi3Z_V##J|9E}u7OT58#|}xW9Qz@fcE;xx<2<|94J9l#<^@h7HyjGi+;Yfvl6F`j zExtl*;Wi=d-CRebm(DR0J-y*n@|&&q=KW^4#L0L>A%b-W&;kZeS3j3^P6