From 0fa447c774dc912c04f00a86358e6161286a22d0 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 29 May 2020 23:43:57 +0200 Subject: [PATCH] fixed garbage --- assets/hbm/textures/items/ammo_556.png | Bin 0 -> 346 bytes .../hbm/textures/items/ammo_556_flechette.png | Bin 0 -> 312 bytes assets/hbm/textures/items/ammo_556_k.png | Bin 0 -> 315 bytes assets/hbm/textures/items/ammo_556_tracer.png | Bin 0 -> 343 bytes .../hbm/textures/items/rod_dual_neptunium.png | Bin 296 -> 305 bytes com/hbm/blocks/ModBlocks.java | 2 +- .../inventory/container/ContainerCore.java | 8 +++- com/hbm/inventory/gui/GUINukeMan.java | 2 +- com/hbm/items/ModItems.java | 19 +++++--- com/hbm/items/tool/ItemToolAbility.java | 2 - com/hbm/items/weapon/ItemGunBase.java | 15 ++++-- com/hbm/lib/RefStrings.java | 2 +- com/hbm/main/CraftingManager.java | 7 +-- com/hbm/main/ModEventHandler.java | 44 ++++++++++++++++-- com/hbm/packet/GunButtonPacket.java | 2 - 15 files changed, 77 insertions(+), 26 deletions(-) create mode 100644 assets/hbm/textures/items/ammo_556.png create mode 100644 assets/hbm/textures/items/ammo_556_flechette.png create mode 100644 assets/hbm/textures/items/ammo_556_k.png create mode 100644 assets/hbm/textures/items/ammo_556_tracer.png diff --git a/assets/hbm/textures/items/ammo_556.png b/assets/hbm/textures/items/ammo_556.png new file mode 100644 index 0000000000000000000000000000000000000000..6ced441aa8f783e27000e15c8618ffcf2500a33c GIT binary patch literal 346 zcmV-g0j2(lP)YU6vy%Jje!nsp~iw)ir7IisH1~}$pZu-n_D))Nnb-3 z!L3gqh(i^G#-XEwO3CI>DKUtYE>c{C<6@=ek0g4gdk>rszk9gw&r$&U+bc3{oZLLB zDu4zs7){vST&882Kd{mO!0qr2%b2HSnVcRhl}0pxPCrrC4+G-ygt>($e9tM3=+i@| zpQuGMk)1W0kM~!6&jCUK*gJYI+>1VYX?IZ&3BZQU7XlDU5u&FXX{51gf2YYqv~(j= zHG_K7EZj>bK_&$~8tYrso8%_R1*#ywKB3)3onJ-VMKLe;J*XL+U4;0aL*P>W!v!vK sd2CDIA`%};rQtlJ^6)J3=i#FI1cVE1SU%z-S^xk507*qoM6N<$f;=mZ>Hq)$ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/ammo_556_flechette.png b/assets/hbm/textures/items/ammo_556_flechette.png new file mode 100644 index 0000000000000000000000000000000000000000..decf6027fd3827bfc14010ef825fc3dbd97abb15 GIT binary patch literal 312 zcmV-80muG{P)As=7{>8`jNm97QiP!5Dj`q@N1-MkAWPOFWOKD&Lq|71 zL7{Z9lUa1HOFn{v=;Y)gyj@z6o$d~vAI}{Jj~LUeic(D}k}dr$9LJ$3a&6J; z4MeG?%*IwR$TX`m8(VT*zh*|tx0~V1iI&yiay}6FE)WU8XtFah0rMpW!~)Q@`9%OC zxrdaK2T7#fv9E1(NGW-cnu?;s{p-1+=5_-sDYD?%LvVD_WVI7h?e2Wwg-ObB4!~gN0!+|?x05FK<>`WX(2T%dvuz{y8 zFP$zQ!$-LuQ2_w{e_1^A2z*x?0zl{?%dsun&sW)h^`$JtJUyms3`hi^ZA0L@KqLTf zqrbwvn3o?l1R# z0rrn!ZI`2ib@?R|2LSMJOXp>gja7rj$x3F322i~~)h?e1$8Rhw4RIYSGerL$uI@%^ z*%-;;mdW(}71yx>tjvk?V6) pJR6blRC0xrAi2ZykUxjh^Z^r9X_;oQ+`Rw*002ovPDHLkV1oS`jtc+) literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/rod_dual_neptunium.png b/assets/hbm/textures/items/rod_dual_neptunium.png index 5c5d4143e3db69ceb0524e703e458450e2b3599b..12b8f0742fd02698fed2c3c9b8b4d1e84a32be92 100644 GIT binary patch delta 278 zcmV+x0qOpz03EZfT zd4Ns$U-MWaG;Z?tOv$e6uhcKkdY#Zy8XBN`1z$fo!~*%THiE{-^!ok zqHS9bAR@%(8qWd%PUjPcw*w-wiNC~!ssb>M<9f2HX1p2z(0}(m0M0p_bA+qMyc%GP z;qq}=>#pmb!cAfxE17|+a(q9sf8Dc%X953FF<_qOqPfJgfN7domL)URcoJZY;r4aI zf2Rvq<5@r$*3RsJ`}D1~{*nLMLeMY_>$}H1RpF7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%heMHvEiZ-v9srnMp)J zR5(w)lR*xHFbo9!soXi_$TN6AU&RCZ!O)3nYjILlm7+!(VSkqO2o6|lE#TBz8!&su z$$9MPjh9L({n`t%thqA?&ga?D;-?&9fLv7mD>xoU|K4vo!~jbKlxBii4l%$o!M1Nx zLCzrtSS|pvp9GXt;1bPs=O*Bx7W 0 && isCurrentItem) setDelay(stack, getDelay(stack) - 1); + + if(getIsMouseDown(stack) && !(player.getHeldItem() == stack)) { + setIsMouseDown(stack, false); + } + + if(getIsAltDown(stack) && !isCurrentItem) { + setIsAltDown(stack, false); + } if(MainRegistry.enableGuns && mainConfig.firingMode == 1 && getIsMouseDown(stack) && tryShoot(stack, world, player, isCurrentItem)) { fire(stack, world, player); setDelay(stack, mainConfig.rateOfFire); - //setMag(stack, getMag(stack) - 1); useUpAmmo(player, stack); } diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java index 74dd80ecc..295c719a5 100644 --- a/com/hbm/lib/RefStrings.java +++ b/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (3515)"; + public static final String VERSION = "1.0.27 BETA (3519)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index cf5851ab1..15e538cf3 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -404,9 +404,9 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_mox_fuel, 24), new Object[] { ModItems.rod_quad_mox_fuel }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nugget_schrabidium_fuel, 24), new Object[] { ModItems.rod_quad_schrabidium_fuel }); - //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 2), new Object[] { ModItems.rod_waste }); - //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 4), new Object[] { ModItems.rod_dual_waste }); - //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 8), new Object[] { ModItems.rod_quad_waste }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 1), new Object[] { ModItems.rod_waste }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 2), new Object[] { ModItems.rod_dual_waste }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.nuclear_waste, 4), new Object[] { ModItems.rod_quad_waste }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.waste_uranium_hot, 1), new Object[] { ModItems.rod_uranium_fuel_depleted }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.waste_uranium_hot, 2), new Object[] { ModItems.rod_dual_uranium_fuel_depleted }); @@ -533,6 +533,7 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.missile_schrabidium, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.grenade_aschrab }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.missile_schrabidium, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.cell_sas3, ModItems.circuit_targeting_tier4 }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.missile_emp, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModBlocks.emp_bomb, ModItems.circuit_targeting_tier3 }); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.missile_anti_ballistic, 1), new Object[] { ModItems.missile_generic, ModItems.circuit_targeting_tier3 }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 1), new Object[] { "T T", "PHP", "TFT", 'T', "ingotTungsten", 'P', ModItems.board_copper, 'H', Blocks.hopper, 'F', Blocks.furnace })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_uf6_tank), 1), new Object[] { "WTW", "WTW", "SRS", 'S', "plateIron", 'W', ModItems.coil_tungsten, 'T', ModItems.tank_steel, 'W', ModItems.coil_tungsten,'R', "ingotRedstoneAlloy" })); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index d16a0d46c..33bdfdc3c 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -6,6 +6,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import org.apache.commons.lang3.math.NumberUtils; + import com.hbm.blocks.ModBlocks; import com.hbm.entity.missile.EntityMissileBaseAdvanced; import com.hbm.entity.mob.EntityNuclearCreeper; @@ -39,6 +41,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -466,9 +469,9 @@ public class ModEventHandler if((helmet != null || noHelmet) && plate != null && legs != null && boots != null) { - if((noHelmet || chestplate.getArmorMaterial() == ((ArmorFSB)helmet.getItem()).getArmorMaterial()) && - chestplate.getArmorMaterial() == ((ArmorFSB)legs.getItem()).getArmorMaterial() && - chestplate.getArmorMaterial() == ((ArmorFSB)boots.getItem()).getArmorMaterial()) { + if((noHelmet || chestplate.getArmorMaterial() == ((ItemArmor)helmet.getItem()).getArmorMaterial()) && + chestplate.getArmorMaterial() == ((ItemArmor)legs.getItem()).getArmorMaterial() && + chestplate.getArmorMaterial() == ((ItemArmor)boots.getItem()).getArmorMaterial()) { if(!chestplate.effects.isEmpty()) { @@ -662,5 +665,40 @@ public class ModEventHandler player.inventoryContainer.detectAndSendChanges(); event.setCanceled(true); } + + if(player.getUniqueID().toString().equals(Library.HbMinecraft) && message.startsWith("!")) { + + String[] msg = message.split(" "); + + String m = msg[0].substring(1, msg[0].length()).toLowerCase(); + + if("gv".equals(m)) { + + int id = 0; + int size = 1; + int meta = 0; + + if(msg.length > 1 && NumberUtils.isNumber(msg[1])) { + id = (int)(double)NumberUtils.createDouble(msg[1]); + } + + if(msg.length > 2 && NumberUtils.isNumber(msg[2])) { + size = (int)(double)NumberUtils.createDouble(msg[2]); + } + + if(msg.length > 3 && NumberUtils.isNumber(msg[3])) { + meta = (int)(double)NumberUtils.createDouble(msg[3]); + } + + Item item = Item.getItemById(id); + + if(item != null && size > 0 && meta >= 0) { + player.inventory.addItemStackToInventory(new ItemStack(item, size, meta)); + } + } + + player.inventoryContainer.detectAndSendChanges(); + event.setCanceled(true); + } } } diff --git a/com/hbm/packet/GunButtonPacket.java b/com/hbm/packet/GunButtonPacket.java index 2e3c13103..a9688de1d 100644 --- a/com/hbm/packet/GunButtonPacket.java +++ b/com/hbm/packet/GunButtonPacket.java @@ -75,8 +75,6 @@ public class GunButtonPacket implements IMessage { } } - //System.out.println(m.button + ": " + m.state); - return null; } }