From 03841c4043ef5ee63dd998855b8d394b1acccea4 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 6 Dec 2020 21:40:21 +0100 Subject: [PATCH] for real now --- src/main/java/assets/hbm/lang/de_DE.lang | 1 + src/main/java/assets/hbm/lang/en_US.lang | 1 + .../java/assets/hbm/textures/items/nugget.png | Bin 0 -> 304 bytes .../hbm/textures/models/capes/CapeLeftNugget.png | Bin 0 -> 590 bytes .../hbm/textures/models/capes/CapeRightNugget.png | Bin 0 -> 613 bytes .../java/com/hbm/inventory/HadronRecipes.java | 9 +++++++++ src/main/java/com/hbm/items/ModItems.java | 5 ++++- src/main/java/com/hbm/lib/Library.java | 2 ++ .../hbm/render/util/RenderAccessoryUtility.java | 8 ++++++++ src/main/resources/mcmod.info | 2 +- 10 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 src/main/java/assets/hbm/textures/items/nugget.png create mode 100644 src/main/java/assets/hbm/textures/models/capes/CapeLeftNugget.png create mode 100644 src/main/java/assets/hbm/textures/models/capes/CapeRightNugget.png diff --git a/src/main/java/assets/hbm/lang/de_DE.lang b/src/main/java/assets/hbm/lang/de_DE.lang index b16ed8eb0..123f1d68a 100644 --- a/src/main/java/assets/hbm/lang/de_DE.lang +++ b/src/main/java/assets/hbm/lang/de_DE.lang @@ -1423,6 +1423,7 @@ item.niter.name=Salpeter item.nothing.name=Leer item.nuclear_waste.name=Atommüll item.nuclear_waste_tiny.name=Kleiner Haufen Atommüll +item.nugget.name=Chicken Nugget item.nugget_australium.name=Australiumnugget item.nugget_beryllium.name=Berylliumnugget item.nugget_daffergon.name=Daffergonnugget diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 63af219f4..b576bc167 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -1423,6 +1423,7 @@ item.niter.name=Niter item.nothing.name=Nothing item.nuclear_waste.name=Nuclear Waste item.nuclear_waste_tiny.name=Tiny Pile of Nuclear Waste +item.nugget.name=Chicken Nugget item.nugget_australium.name=Australium Nugget item.nugget_beryllium.name=Beryllium Nugget item.nugget_daffergon.name=Daffergon Nugget diff --git a/src/main/java/assets/hbm/textures/items/nugget.png b/src/main/java/assets/hbm/textures/items/nugget.png new file mode 100644 index 0000000000000000000000000000000000000000..21b0b33e2f4deb00b0dd542ebdc6c7915ec04585 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfEQ>fgn|A}ul$cA&SI?nL_{Ph3-Ev~-(|NryT{}XwYUo_cAU-@TTU}#vg zSMT_N^wbj{Uf!r=v(t8NyE-*GAm&iZgnPb zQZeW4ZAZUD4kE`sx?g7TiV^I8u*llerlIqr$h^baJFYla@Ri3ksInWZ>&Od;NDVZO!w(Kh-Qz=grtIM^DyKKi{r>8^Vrt|vqx}0zuj;oQ zUg##f_Vct<$(57pJbh=2{){b@V!v&+e5b{>>{j_|*#jMSIcGgfe%iiuGUKWwxj(yh zt`cuu8}`RHncX0%wCR=2nm-m<#txx9lQ-JBUv_n8`>=j1v&2H{M#=e8<)@o6hqT&Q zrbcdyOG#n)zeDs+v7h9F{R+%K+}U4PKIi#R@K?vkPh~Gh%tThn1NPtf3@pVW^_ZtI z@dA~7d={FraZ2e=q1Ef6fST`E9SHjWM44wf&xU_L?0)9IpTF?+MkVGS&#y3^%lB86 z^m~#inDSXbL=_k&l{aJV%{_53qTF0e^1yz-?~Lo-op-v*s5*BZYliibD1O#*rs{Q< zH#bb^Z;3so1~g-jyuz2_s&9-h3QjQ?Zfo6n#u4m~BT+L;7-X;U2oz^qNIJMDvv=%O zddXmwW!!M={^1i0R^O}|u6ZqCe&O-DF8ubtWwM8|wr0(p&I62oEMUR@eGG4(9d7!> R^}rn@?dj_0vd$@?2>@)z`%3@- literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/capes/CapeRightNugget.png b/src/main/java/assets/hbm/textures/models/capes/CapeRightNugget.png new file mode 100644 index 0000000000000000000000000000000000000000..6a0e20073f79a002a7b0276416ae607103b6ab33 GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}DLQY^(zo*^7SP{WbZ!N9;Iwsswx#%p1-3XwlY zSkoKI^`EVlRj<{Hn>KHAHZMcdfJse4fz$4AExFAtl?&YzR{c_qX5zwbJBvC7Ps%d(kkTB~ayFo*Hj<(bDW zU#$!M_1w~-oQ3_s^!Kk9<$rs%_DJ#_KVVS2o@|^Nxh+a~g+;s60_zCwibqoQnju{4 z86$+YU4G%c&@h5)+t%qk8?t#1oY|f}jd8}$OoNp`@@0lCv%%-fm$HE3{{GpL4KwF2 td%zH(Bet~uv!3<6kn4QFWPt?)Jk|GLyTbK<^8^);tf#A=%Q~loCIA+-2?78B literal 0 HcmV?d00001 diff --git a/src/main/java/com/hbm/inventory/HadronRecipes.java b/src/main/java/com/hbm/inventory/HadronRecipes.java index 2ca985c09..2a51999aa 100644 --- a/src/main/java/com/hbm/inventory/HadronRecipes.java +++ b/src/main/java/com/hbm/inventory/HadronRecipes.java @@ -6,6 +6,7 @@ import java.util.List; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.items.ModItems; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class HadronRecipes { @@ -92,6 +93,14 @@ public class HadronRecipes { new ItemStack(ModItems.particle_empty), false )); + recipes.add(new HadronRecipe( + new ItemStack(Items.chicken), + new ItemStack(Items.chicken), + 800, + new ItemStack(ModItems.nugget), + new ItemStack(ModItems.nugget), + false + )); } /** diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 1430e33ac..76a73fbad 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1407,6 +1407,7 @@ public class ModItems { public static Item static_sandwich; public static Item pudding; public static Item pancake; + public static Item nugget; public static Item med_ipecac; public static Item med_ptsd; @@ -3308,7 +3309,8 @@ public class ModItems { canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13"); canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka"); pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake"); - + nugget = new ItemLemon(200, 200, false).setUnlocalizedName("nugget").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nugget"); + defuser = new Item().setUnlocalizedName("defuser").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":defuser"); flame_pony = new ItemCustomLore().setUnlocalizedName("flame_pony").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":flame_pony"); @@ -5742,6 +5744,7 @@ public class ModItems { GameRegistry.registerItem(static_sandwich, static_sandwich.getUnlocalizedName()); GameRegistry.registerItem(pudding, pudding.getUnlocalizedName()); GameRegistry.registerItem(pancake, pancake.getUnlocalizedName()); + GameRegistry.registerItem(nugget, nugget.getUnlocalizedName()); GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName()); GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName()); GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 1ad616835..3d718eb7f 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -72,6 +72,8 @@ public class Library { public static String Drillgon = "41ebd03f-7a12-42f3-b037-0caa4d6f235b"; public static String Doctor17 = "e4ab1199-1c22-4f82-a516-c3238bc2d0d1"; public static String ShimmeringBlaze = "061bc566-ec74-4307-9614-ac3a70d2ef38"; + public static String FifeMiner = "37e5eb63-b9a2-4735-9007-1c77d703daa3"; + public static String lag_add = "259785a0-20e9-4c63-9286-ac2f93ff528f"; public static Set contributors = Sets.newHashSet(new String[] { "06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index 069e290d5..28e39d7df 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -30,6 +30,8 @@ public class RenderAccessoryUtility { private static ResourceLocation doctor17 = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeDoctor17.png"); private static ResourceLocation shimmeringblaze = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeBlaze.png"); private static ResourceLocation wiki = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeWiki.png"); + private static ResourceLocation leftnugget = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeLeftNugget.png"); + private static ResourceLocation rightnugget = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeRightNugget.png"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -96,6 +98,12 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.ShimmeringBlaze)) { return shimmeringblaze; } + if(uuid.equals(Library.FifeMiner)) { + return leftnugget; + } + if(uuid.equals(Library.lag_add)) { + return rightnugget; + } if(Library.contributors.contains(uuid)) { return wiki; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3bfeb4818..774503dc2 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27-3365", + "version":"1.0.27-3710", "mcversion": "1.7.10", "url": "", "updateUrl": "",