Skip to content

Commit

Permalink
shotty improvements, radar stuff, general polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Aug 9, 2020
1 parent bea57c2 commit 6934fed
Show file tree
Hide file tree
Showing 9 changed files with 13,470 additions and 38,844 deletions.
52,111 changes: 13,315 additions & 38,796 deletions src/main/java/assets/hbm/models/weapons/supershotty.obj

Large diffs are not rendered by default.

Binary file modified src/main/java/assets/hbm/textures/gui/gui_radar.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
import com.hbm.interfaces.IBulletHurtBehavior;
import com.hbm.items.ModItems;
import com.hbm.potion.HbmPotion;
import com.hbm.render.anim.BusAnimation;
import com.hbm.render.anim.BusAnimationKeyframe;
import com.hbm.render.anim.BusAnimationSequence;
import com.hbm.render.anim.HbmAnimations.AnimType;
import com.hbm.render.util.RenderScreenOverlay.Crosshair;

import net.minecraft.entity.Entity;
Expand Down Expand Up @@ -68,6 +72,29 @@ public static GunConfiguration getShottyConfig() {
config.reloadSound = GunConfiguration.RSOUND_REVOLVER;
config.firingSound = "hbm:weapon.shottyShoot";

config.animations.put(AnimType.CYCLE, new BusAnimation()
.addBus("SHOTTY_RECOIL", new BusAnimationSequence()
.addKeyframe(new BusAnimationKeyframe(0.5, 0, 0, 50))
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 50))
)
.addBus("SHOTTY_BREAK", new BusAnimationSequence()
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 100)) //do nothing for 100ms
.addKeyframe(new BusAnimationKeyframe(0, 0, 60, 200)) //open
.addKeyframe(new BusAnimationKeyframe(0, 0, 60, 500)) //do nothing for 500ms
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 200)) //close
)
.addBus("SHOTTY_EJECT", new BusAnimationSequence()
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 300)) //do nothing for 300ms
.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 700)) //fling!
)
.addBus("SHOTTY_INSERT", new BusAnimationSequence()
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 300)) //do nothing for 300ms
.addKeyframe(new BusAnimationKeyframe(1, 0, 1, 0)) //reposition
.addKeyframe(new BusAnimationKeyframe(1, 0, 0, 350)) //come in from the side
.addKeyframe(new BusAnimationKeyframe(0, 0, 0, 150)) //push
)
);

config.name = "???";
config.manufacturer = "???";
config.comment.add("but bOB WhY iS TExtURE no woRk");
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/hbm/items/ModItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -3299,15 +3299,15 @@ public static void initializeItem()
battery_spark_cell_10000 = new ItemBattery(100000000L * 10000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_10000").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_10000");
battery_spark_cell_power = new ItemBattery(100000000L * 1000000L, 200000000, 200000000).setUnlocalizedName("battery_spark_cell_power").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_spark_cell_power");

battery_potato = new ItemBattery(1, 0, 1).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato");
battery_potatos = new ItemPotatos(50, 0, 1).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos");
battery_su = new ItemBattery(15, 0, 1).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su");
battery_su_l = new ItemBattery(35, 0, 1).setUnlocalizedName("battery_su_l").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su_l");
battery_steam = new ItemBattery(600, 3, 60).setUnlocalizedName("battery_steam").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_steam");
battery_steam_large = new ItemBattery(1000, 5, 100).setUnlocalizedName("battery_steam_large").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_steam_large");
fusion_core = new ItemBattery(200000, 0, 25).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core");
battery_potato = new ItemBattery(100, 0, 100).setUnlocalizedName("battery_potato").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potato");
battery_potatos = new ItemPotatos(5000, 0, 100).setUnlocalizedName("battery_potatos").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_potatos");
battery_su = new ItemBattery(1500, 0, 100).setUnlocalizedName("battery_su").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su");
battery_su_l = new ItemBattery(3500, 0, 100).setUnlocalizedName("battery_su_l").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_su_l");
battery_steam = new ItemBattery(60000, 300, 6000).setUnlocalizedName("battery_steam").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_steam");
battery_steam_large = new ItemBattery(100000, 500, 10000).setUnlocalizedName("battery_steam_large").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":battery_steam_large");
fusion_core = new ItemBattery(20000000, 0, 2500).setUnlocalizedName("fusion_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core");
fusion_core_infinite = new Item().setUnlocalizedName("fusion_core_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fusion_core_infinite");
energy_core = new ItemBattery(100000, 0, 10).setUnlocalizedName("energy_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":energy_core");
energy_core = new ItemBattery(10000000, 0, 1000).setUnlocalizedName("energy_core").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":energy_core");
fuse = new ItemCustomLore().setUnlocalizedName("fuse").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fuse");
redcoil_capacitor = new ItemCapacitor(10).setUnlocalizedName("redcoil_capacitor").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":redcoil_capacitor");
titanium_filter = new ItemCapacitor(72000).setUnlocalizedName("titanium_filter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":titanium_filter");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hbm/items/tool/ItemDiscord.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void addInformation(ItemStack itemstack, EntityPlayer player, List list,
list.add(EnumChatFormatting.RED + "" + EnumChatFormatting.ITALIC + "Rod of Discord is crucial in so many boss fights.");
list.add(EnumChatFormatting.RED + "" + EnumChatFormatting.ITALIC + "Imagine getting coiled by worm bosses.");
list.add("");
list.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.ITALIC + "Oh, you mean the terraria item.");
list.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.ITALIC + "Oh, you mean the Terraria item.");
list.add(EnumChatFormatting.YELLOW + "" + EnumChatFormatting.ITALIC + "Idk about that thing.");
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/hbm/main/ClientProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public void registerItemRenderer() {
MinecraftForgeClient.registerItemRenderer(ModItems.gun_brimstone, new ItemRenderObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_deagle, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_supershotgun, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_supershotgun, new ItemRenderWeaponShotty());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_ks23, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_flamer, new ItemRenderWeaponObj());
MinecraftForgeClient.registerItemRenderer(ModItems.gun_flechette, new ItemRenderWeaponObj());
Expand Down
31 changes: 0 additions & 31 deletions src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponObj.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
if(item.getItem() == ModItems.gun_deagle)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.turbofan_blades_tex);

if(item.getItem() == ModItems.gun_supershotgun)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.turbofan_blades_tex);

if(item.getItem() == ModItems.gun_ks23)
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.ks23_tex);

Expand Down Expand Up @@ -93,17 +90,6 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
}
}

if(item.getItem() == ModItems.gun_supershotgun) {
GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(-0.5F, -0.2F, -0.3F);
GL11.glScalef(1.5F, 1.5F, 1.5F);

if(player.isSneaking()) {
GL11.glTranslatef(0F, 0.25F, -0.555F);
GL11.glRotatef(-5F, 0.0F, 1.0F, 0.0F);
}
}

if(item.getItem() == ModItems.gun_ks23) {
GL11.glTranslatef(1.0F, 0.85F, -0.25F);
GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F);
Expand Down Expand Up @@ -183,13 +169,6 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glScaled(0.15, 0.15, 0.15);
}

if(item.getItem() == ModItems.gun_supershotgun) {
GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F);
GL11.glRotatef(-80F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(-0.5F, -0.3F, -0.5F);
GL11.glScaled(1.5, 1.5, 1.5);
}

if(item.getItem() == ModItems.gun_ks23) {
GL11.glRotatef(20F, 1.0F, 0.0F, 1.0F);
GL11.glRotatef(10F, 0.0F, 1.0F, 0.0F);
Expand Down Expand Up @@ -233,10 +212,6 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
GL11.glScaled(0.25, 0.25, 0.25);
}

if(item.getItem() == ModItems.gun_supershotgun) {
GL11.glTranslatef(-1.0F, -0.2F, 0.0F);
}

if(item.getItem() == ModItems.gun_ks23) {
GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F);
Expand Down Expand Up @@ -331,12 +306,6 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
GL11.glShadeModel(GL11.GL_FLAT);
}

if(item.getItem() == ModItems.gun_supershotgun) {
GL11.glShadeModel(GL11.GL_SMOOTH);
ResourceManager.shotty.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}

if(item.getItem() == ModItems.gun_ks23) {
GL11.glShadeModel(GL11.GL_SMOOTH);
ResourceManager.ks23.renderAll();
Expand Down
118 changes: 118 additions & 0 deletions src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponShotty.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
package com.hbm.render.item.weapon;

import org.lwjgl.opengl.GL11;

import com.hbm.main.ResourceManager;
import com.hbm.render.anim.HbmAnimations;

import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;

public class ItemRenderWeaponShotty implements IItemRenderer {

public ItemRenderWeaponShotty() { }

@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
switch(type) {
case EQUIPPED:
case EQUIPPED_FIRST_PERSON:
case ENTITY:
return true;
case INVENTORY:
return false;
default: return false;
}
}

@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {

return type == ItemRenderType.ENTITY && (helper == ItemRendererHelper.ENTITY_ROTATION || helper == ItemRendererHelper.ENTITY_BOBBING);
}

@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {

GL11.glPushMatrix();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glShadeModel(GL11.GL_SMOOTH);

Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.universal);

EntityPlayer player = Minecraft.getMinecraft().thePlayer;

switch(type) {

case EQUIPPED_FIRST_PERSON:

double[] recoil = HbmAnimations.getRelevantTransformation("SHOTTY_RECOIL");
double[] eject = HbmAnimations.getRelevantTransformation("SHOTTY_BREAK");
double[] ejectShell = HbmAnimations.getRelevantTransformation("SHOTTY_EJECT");
double[] insertShell = HbmAnimations.getRelevantTransformation("SHOTTY_INSERT");

GL11.glScalef(0.5F, 0.5F, 0.5F);
GL11.glRotatef(20F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(-10F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(1.75F, -0.2F, -0.3F);

if(player.isSneaking()) {
GL11.glTranslatef(0F, 1.0F, -1.8F);
GL11.glRotatef(3.5F, 0.0F, 1.0F, 0.0F);
}

GL11.glTranslated(-recoil[0] * 2, 0, 0);
GL11.glRotated(recoil[0] * 5, 0, 0, 1);

GL11.glPushMatrix();
GL11.glRotated(-eject[2], 0, 0, 1);
ResourceManager.shotty.renderPart("Barrel");

GL11.glPushMatrix();
GL11.glRotated(ejectShell[0] * 90, 0, 0, 1);
GL11.glTranslated(-ejectShell[0] * 10, 0, 0);
ResourceManager.shotty.renderPart("Shells");
GL11.glPopMatrix();

GL11.glPushMatrix();
GL11.glTranslated(-insertShell[0], insertShell[2] * -2, insertShell[2] * -1);
ResourceManager.shotty.renderPart("Shells");
GL11.glPopMatrix();

GL11.glPopMatrix();

ResourceManager.shotty.renderPart("Handle");

break;

case EQUIPPED:

GL11.glRotatef(-80F, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(-10F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(5F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.5F, 0.0F, -0.4F);
GL11.glScaled(0.35, 0.35, 0.35);
ResourceManager.shotty.renderPart("Handle");
ResourceManager.shotty.renderPart("Barrel");

break;

case ENTITY:

GL11.glScaled(0.5, 0.5, 0.5);
GL11.glTranslatef(-1.0F, 0.2F, 0.0F);
ResourceManager.shotty.renderPart("Handle");
ResourceManager.shotty.renderPart("Barrel");
break;

default: break;
}

GL11.glShadeModel(GL11.GL_FLAT);

GL11.glPopMatrix();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,13 @@
import java.util.ArrayList;
import java.util.List;

import com.hbm.entity.missile.EntityMissileAntiBallistic;
import com.hbm.entity.missile.EntityMissileBaseAdvanced;
import com.hbm.interfaces.IConsumer;
import com.hbm.interfaces.Untested;
import com.hbm.main.MainRegistry;
import com.hbm.packet.AuxElectricityPacket;
import com.hbm.packet.PacketDispatcher;
import com.hbm.packet.TERadarDestructorPacket;
import com.hbm.packet.TERadarPacket;
import com.hbm.tileentity.TileEntityTickingBase;

import api.hbm.energy.IRadarDetectable;
import api.hbm.energy.IRadarDetectable.RadarTargetType;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.Entity;
Expand Down

0 comments on commit 6934fed

Please sign in to comment.