mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
d i a m o n d g a v e l
This commit is contained in:
parent
b905837bf1
commit
62931c71d6
@ -813,6 +813,7 @@ item.detonator_de.name=Totmannladung
|
||||
item.detonator_deadman.name=Totmannzünder
|
||||
item.detonator_laser.name=Laserzünder
|
||||
item.detonator_multi.name=Mehrfach-Fernzünder
|
||||
item.diamond_gavel.name=Diamantener Richterhammer
|
||||
item.door_bunker.name=Bunkertür
|
||||
item.door_metal.name=Metalltür
|
||||
item.door_office.name=Bürotür
|
||||
@ -1157,6 +1158,7 @@ item.key.name=Schlüssel
|
||||
item.key_fake.name=Gefälschter Schlüssel
|
||||
item.key_kit.name=Schlüssel-Imitationskit
|
||||
item.key_red.name=Roter Schlüssel
|
||||
item.lead_gavel.name=Bleierner Richterhammer
|
||||
item.lemon.name="Zitrone"
|
||||
item.letter.name=Eilbrief
|
||||
item.levitation_unit.name=Gravitationsmanipulator
|
||||
@ -1936,6 +1938,7 @@ item.wire_red_copper.name=Roter Kupferdraht
|
||||
item.wire_schrabidium.name=Schrabidiumdraht
|
||||
item.wire_tungsten.name=Wolframdraht
|
||||
item.wiring_red_copper.name=Kabeltrommel
|
||||
item.wood_gavel.name=Hölzerner Richterhammer
|
||||
item.wrench.name=Rohrzange
|
||||
item.wrench_flipped.name=Rohrzange mit Klinge
|
||||
|
||||
|
||||
@ -813,6 +813,7 @@ item.detonator_de.name=Dead Man's Explosive
|
||||
item.detonator_deadman.name=Dead Man's Detonator
|
||||
item.detonator_laser.name=Laser Detonator
|
||||
item.detonator_multi.name=Multi Detonator
|
||||
item.diamond_gavel.name=Diamond Gavel
|
||||
item.door_bunker.name=Bunker Door
|
||||
item.door_metal.name=Metal Door
|
||||
item.door_office.name=Office Door
|
||||
@ -1157,6 +1158,7 @@ item.key.name=Key
|
||||
item.key_fake.name=Counterfeit Key
|
||||
item.key_kit.name=Key Imitation Kit
|
||||
item.key_red.name=Red Key
|
||||
item.lead_gavel.name=Leaden Gavel
|
||||
item.lemon.name="Lemon"
|
||||
item.letter.name=Express Mail
|
||||
item.levitation_unit.name=Gravity Manipulator
|
||||
@ -1936,6 +1938,7 @@ item.wire_red_copper.name=Red Copper Wire
|
||||
item.wire_schrabidium.name=Schrabidium Wire
|
||||
item.wire_tungsten.name=Tungsten Wire
|
||||
item.wiring_red_copper.name=Cable Drum
|
||||
item.wood_gavel.name=Wooden Gavel
|
||||
item.wrench.name=Pipe Wrench
|
||||
item.wrench_flipped.name=Blade on a Wrench
|
||||
|
||||
|
||||
2037
src/main/java/assets/hbm/models/weapons/gavel.obj
Normal file
2037
src/main/java/assets/hbm/models/weapons/gavel.obj
Normal file
File diff suppressed because it is too large
Load Diff
@ -135,6 +135,7 @@
|
||||
"weapon.fstbmbStart": {"category": "player", "sounds": [{"name": "weapon/fstbmbStart", "stream": false}]},
|
||||
"weapon.fstbmbPing": {"category": "player", "sounds": [{"name": "weapon/fstbmbPing", "stream": false}]},
|
||||
"weapon.sauergun": {"category": "player", "sounds": ["weapon/sauergun1", "weapon/sauergun2", "weapon/sauergun3"]},
|
||||
"weapon.whack": {"category": "player", "sounds": [{"name": "weapon/whack", "stream": false}]},
|
||||
|
||||
"weapon.reloadTurret": {"category": "player", "sounds": [{"name": "weapon/reloadTurret", "stream": false}]},
|
||||
"weapon.switchmode1": {"category": "player", "sounds": [{"name": "weapon/switchmode1", "stream": false}]},
|
||||
|
||||
BIN
src/main/java/assets/hbm/textures/items/lead_gavel.png
Normal file
BIN
src/main/java/assets/hbm/textures/items/lead_gavel.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 318 B |
Binary file not shown.
|
After Width: | Height: | Size: 362 B |
BIN
src/main/java/assets/hbm/textures/models/weapons/gavel_lead.png
Normal file
BIN
src/main/java/assets/hbm/textures/models/weapons/gavel_lead.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 340 B |
BIN
src/main/java/assets/hbm/textures/models/weapons/gavel_wood.png
Normal file
BIN
src/main/java/assets/hbm/textures/models/weapons/gavel_wood.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 300 B |
@ -5,6 +5,7 @@ import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.inventory.RecipesCommon.AStack;
|
||||
import com.hbm.inventory.RecipesCommon.OreDictStack;
|
||||
import com.hbm.inventory.RecipesCommon.ComparableStack;
|
||||
@ -65,6 +66,12 @@ public class MagicRecipes {
|
||||
new ComparableStack(ModItems.egg_balefire_shard),
|
||||
new ComparableStack(ModItems.powder_magic),
|
||||
new ComparableStack(ModItems.powder_magic)));
|
||||
|
||||
recipes.add(new MagicRecipe(new ItemStack(ModItems.diamond_gavel),
|
||||
new ComparableStack(ModBlocks.gravel_diamond),
|
||||
new ComparableStack(ModBlocks.gravel_diamond),
|
||||
new ComparableStack(ModBlocks.gravel_diamond),
|
||||
new ComparableStack(ModItems.lead_gavel)));
|
||||
}
|
||||
|
||||
public static List<MagicRecipe> getRecipes() {
|
||||
|
||||
@ -1649,6 +1649,9 @@ public class ModItems {
|
||||
public static Item shimmer_axe;
|
||||
public static Item bottle_opener;
|
||||
public static Item pch;
|
||||
public static Item wood_gavel;
|
||||
public static Item lead_gavel;
|
||||
public static Item diamond_gavel;
|
||||
|
||||
public static Item crowbar;
|
||||
|
||||
@ -3826,6 +3829,9 @@ public class ModItems {
|
||||
wrench_flipped = new WeaponSpecial(MainRegistry.tMatElec).setUnlocalizedName("wrench_flipped").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wrench_flipped");
|
||||
memespoon = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("memespoon").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":memespoon");
|
||||
pch = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("pch").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":pch");
|
||||
wood_gavel = new WeaponSpecial(ToolMaterial.WOOD).setUnlocalizedName("wood_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wood_gavel");
|
||||
lead_gavel = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("lead_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":lead_gavel");
|
||||
diamond_gavel = new WeaponSpecial(ToolMaterial.EMERALD).setUnlocalizedName("diamond_gavel").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":diamond_gavel");
|
||||
|
||||
multitool_hit = new ItemMultitoolPassive().setUnlocalizedName("multitool_hit").setCreativeTab(null).setTextureName(RefStrings.MODID + ":multitool_fist");
|
||||
multitool_dig = new ItemMultitoolTool(4.0F, MainRegistry.enumToolMaterialMultitool, ItemMultitoolTool.getAllBlocks()).setFull3D().setUnlocalizedName("multitool_dig").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":multitool_claw");
|
||||
@ -5450,13 +5456,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(cape_radiation, cape_radiation.getUnlocalizedName());
|
||||
GameRegistry.registerItem(cape_gasmask, cape_gasmask.getUnlocalizedName());
|
||||
GameRegistry.registerItem(cape_schrabidium, cape_schrabidium.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_hbm, cape_hbm.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_dafnik, cape_dafnik.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_lpkukin, cape_lpkukin.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_vertice, cape_vertice.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_codered_, cape_codered_.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_ayy, cape_ayy.getUnlocalizedName());
|
||||
//GameRegistry.registerItem(cape_nostalgia, cape_nostalgia.getUnlocalizedName());
|
||||
|
||||
//Tools
|
||||
GameRegistry.registerItem(schrabidium_sword, schrabidium_sword.getUnlocalizedName());
|
||||
@ -5464,6 +5463,9 @@ public class ModItems {
|
||||
GameRegistry.registerItem(shimmer_sledge, shimmer_sledge.getUnlocalizedName());
|
||||
GameRegistry.registerItem(shimmer_axe, shimmer_axe.getUnlocalizedName());
|
||||
GameRegistry.registerItem(pch, pch.getUnlocalizedName());
|
||||
GameRegistry.registerItem(wood_gavel, wood_gavel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(lead_gavel, lead_gavel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(diamond_gavel, diamond_gavel.getUnlocalizedName());
|
||||
GameRegistry.registerItem(schrabidium_pickaxe, schrabidium_pickaxe.getUnlocalizedName());
|
||||
GameRegistry.registerItem(schrabidium_axe, schrabidium_axe.getUnlocalizedName());
|
||||
GameRegistry.registerItem(schrabidium_shovel, schrabidium_shovel.getUnlocalizedName());
|
||||
|
||||
@ -134,12 +134,29 @@ public class WeaponSpecial extends ItemSword {
|
||||
}
|
||||
|
||||
if(this == ModItems.shimmer_axe) {
|
||||
|
||||
entity.setHealth(entity.getHealth() / 2);
|
||||
|
||||
world.playSoundAtEntity(entity, "hbm:weapon.slice", 3.0F, 1.F);
|
||||
}
|
||||
|
||||
if(this == ModItems.wood_gavel) {
|
||||
world.playSoundAtEntity(entity, "hbm:weapon.whack", 3.0F, 1.F);
|
||||
}
|
||||
|
||||
if(this == ModItems.lead_gavel) {
|
||||
world.playSoundAtEntity(entity, "hbm:weapon.whack", 3.0F, 1.F);
|
||||
|
||||
entity.addPotionEffect(new PotionEffect(HbmPotion.lead.id, 15 * 20, 4));
|
||||
}
|
||||
|
||||
if(this == ModItems.diamond_gavel) {
|
||||
|
||||
float ded = entity.getMaxHealth() / 3;
|
||||
entity.setHealth(entity.getHealth() - ded);
|
||||
|
||||
world.playSoundAtEntity(entity, "hbm:weapon.whack", 3.0F, 1.F);
|
||||
}
|
||||
|
||||
if(this == ModItems.wrench) {
|
||||
|
||||
Vec3 vec = entityPlayer.getLookVec();
|
||||
@ -313,6 +330,18 @@ public class WeaponSpecial extends ItemSword {
|
||||
list.add(EnumChatFormatting.RED + "20% slower firing speed");
|
||||
list.add(EnumChatFormatting.RED + "No random critical hits");
|
||||
}
|
||||
|
||||
if(this == ModItems.wood_gavel) {
|
||||
list.add("Thunk!");
|
||||
}
|
||||
if(this == ModItems.lead_gavel) {
|
||||
list.add("You are hereby sentenced to lead poisoning.");
|
||||
}
|
||||
if(this == ModItems.diamond_gavel) {
|
||||
list.add("The joke! It makes sense now!!");
|
||||
list.add("");
|
||||
list.add(EnumChatFormatting.BLUE + "Deals as much damage as it needs to.");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -203,6 +203,9 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.chernobylsign, new ItemRenderShim());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.wood_gavel, new ItemRenderGavel());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.lead_gavel, new ItemRenderGavel());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.diamond_gavel, new ItemRenderGavel());
|
||||
//guns
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg());
|
||||
|
||||
@ -1623,6 +1623,9 @@ public class CraftingManager {
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', "ingotPolymer", 'T', ModBlocks.machine_transformer }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer }));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wood_gavel, 1), new Object[] { "SWS", " R ", " R ", 'S', "slabWood", 'W', "logWood", 'R', "stickWood" }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lead_gavel, 1), new Object[] { "PIP", "IGI", "PIP", 'P', ModItems.pellet_buckshot, 'I', "ingotLead", 'G', ModItems.wood_gavel }));
|
||||
|
||||
}
|
||||
|
||||
public static void AddSmeltingRec()
|
||||
|
||||
@ -382,6 +382,7 @@ public class ResourceManager {
|
||||
public static final IModelCustom shimmer_axe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/shimmer_axe.obj"));
|
||||
public static final IModelCustom stopsign = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/stopsign.obj"));
|
||||
public static final IModelCustom pch = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/pch.obj"));
|
||||
public static final IModelCustom gavel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/gavel.obj"));
|
||||
|
||||
public static final IModelCustom brimstone = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/brimstone.obj"));
|
||||
public static final IModelCustom hk69 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/hk69.obj"));
|
||||
@ -406,6 +407,9 @@ public class ResourceManager {
|
||||
public static final ResourceLocation sopsign_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/sopsign.png");
|
||||
public static final ResourceLocation chernobylsign_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/chernobylsign.png");
|
||||
public static final ResourceLocation pch_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/pch.png");
|
||||
public static final ResourceLocation gavel_wood = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_wood.png");
|
||||
public static final ResourceLocation gavel_lead = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_lead.png");
|
||||
public static final ResourceLocation gavel_diamond = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/gavel_diamond.png");
|
||||
|
||||
public static final ResourceLocation brimstone_tex = new ResourceLocation(RefStrings.MODID, "textures/models/brimstone.png");
|
||||
public static final ResourceLocation hk69_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/hk69.png");
|
||||
|
||||
@ -0,0 +1,80 @@
|
||||
package com.hbm.render.item.weapon;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.main.ResourceManager;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
public class ItemRenderGavel implements IItemRenderer {
|
||||
|
||||
public ItemRenderGavel() { }
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
switch(type) {
|
||||
case EQUIPPED:
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
case ENTITY:
|
||||
return true;
|
||||
default: return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_BOBBING || helper == ItemRendererHelper.ENTITY_ROTATION);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
GL11.glPushMatrix();
|
||||
|
||||
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
|
||||
|
||||
if(item.getItem() == ModItems.wood_gavel)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_wood);
|
||||
if(item.getItem() == ModItems.lead_gavel)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_lead);
|
||||
if(item.getItem() == ModItems.diamond_gavel)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.gavel_diamond);
|
||||
|
||||
switch(type) {
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
|
||||
GL11.glTranslated(1, 0.5, 0);
|
||||
|
||||
if(player.isBlocking()) {
|
||||
GL11.glTranslated(-0.5, 0, 0);
|
||||
}
|
||||
|
||||
GL11.glRotated(45, 0, 0, 1);
|
||||
GL11.glRotated(90, 0, 1, 0);
|
||||
|
||||
break;
|
||||
|
||||
case ENTITY:
|
||||
GL11.glTranslated(-0.5, 0, 0);
|
||||
case EQUIPPED:
|
||||
|
||||
GL11.glScaled(0.5, 0.5, 0.5);
|
||||
GL11.glRotated(45, 0, 0, 1);
|
||||
GL11.glTranslated(1.375, 0, 0);
|
||||
GL11.glRotated(90, 0, 1, 0);
|
||||
|
||||
break;
|
||||
|
||||
default: break;
|
||||
}
|
||||
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
ResourceManager.gavel.renderAll();
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user