diff --git a/changelog b/changelog index 1f55cd941..d4a2c8ae3 100644 --- a/changelog +++ b/changelog @@ -4,6 +4,10 @@ * Can toggle `DAMAGE_COMPATIBILITY_MODE`, off by default, enables a more compatible (but slightly jankier) version of the bullet damage code * `MINE__DAMAGE` can be used to adjust landmine damage * `TAINT_TRAILS` now replaces the hardcore taint config option, making taint blocks more potent and the potion effect trail taint blocks +* New ammo types + * Explosive 7.62mm + * Explosive .50 BMG + * Explosive 10 gauge buckshot (unlike 12 gauge which has explosive slugs) ## Changed * Fat mines now use the standardized mini nuke code @@ -23,7 +27,7 @@ * Copper wires, like AA and gold, can now be welded into dense wires ## Fixed -* Fixed animation error on the MAS-36 +* Fixed animation errors on the MAS-36 * Fixed drone docks, requester and provider crates not dropping their contents when broken * Fixed all missing texture errors that appear in the startup log * Potentially fixed a crash with mekanism during the recipe change phase diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 7dac239ef..759ae0e9e 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -464,6 +464,7 @@ public class ModBlocks { public static Block glass_polonium; public static Block glass_ash; public static Block glass_quartz; + public static Block glass_polarized; public static Block mush; public static Block mush_block; @@ -1648,6 +1649,7 @@ public class ModBlocks { glass_polonium = new BlockNTMGlassCT(1, RefStrings.MODID + ":glass_polonium", Material.glass).setBlockName("glass_polonium").setLightLevel(5F/15F).setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); glass_ash = new BlockNTMGlassCT(1, RefStrings.MODID + ":glass_ash", Material.glass).setBlockName("glass_ash").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(3F); glass_quartz = new BlockNTMGlassCT(0, RefStrings.MODID + ":glass_quartz", Material.packedIce, true).setBlockName("glass_quartz").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGlass).setHardness(1.0F).setResistance(40.0F).setBlockTextureName(RefStrings.MODID + "glass_quartz"); + glass_polarized = new BlockNTMGlassCT(0, RefStrings.MODID + ":glass_polarized", Material.glass).setBlockName("glass_polarized").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); mush = new BlockMush(Material.plants).setBlockName("mush").setCreativeTab(MainRegistry.blockTab).setLightLevel(0.5F).setStepSound(Block.soundTypeGrass).setBlockTextureName(RefStrings.MODID + ":mush"); mush_block = new BlockMushHuge(Material.plants).setBlockName("mush_block").setLightLevel(1.0F).setStepSound(Block.soundTypeGrass).setHardness(0.2F).setBlockTextureName(RefStrings.MODID + ":mush_block_skin"); @@ -2940,6 +2942,7 @@ public class ModBlocks { GameRegistry.registerBlock(glass_polonium, glass_polonium.getUnlocalizedName()); GameRegistry.registerBlock(glass_ash, glass_ash.getUnlocalizedName()); GameRegistry.registerBlock(glass_quartz, glass_quartz.getUnlocalizedName()); + GameRegistry.registerBlock(glass_polarized, glass_polarized.getUnlocalizedName()); //Silo Hatch GameRegistry.registerBlock(seal_frame, seal_frame.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java index b5b4486de..64f058fb7 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactory.java @@ -91,7 +91,7 @@ public class GunFactory { COIL_TUNGSTEN, COIL_FERROURANIUM, NUKE_STANDARD, NUKE_DEMO, NUKE_HIGH, NUKE_TOTS, NUKE_HIVE, G10, G10_SHRAPNEL, G10_DU, G10_SLUG, - R762_HE, BMG50_HE + R762_HE, BMG50_HE, G10_EXPLOSIVE //ONLY ADD NEW ENTRIES AT THE BOTTOM TO AVOID SHIFTING! ; @@ -108,7 +108,7 @@ public class GunFactory { BMG50_SP, BMG50_FMJ, BMG50_JHP, BMG50_AP, BMG50_DU, BMG50_HE, B75, B75_INC, B75_EXP, G12_BP, G12_BP_MAGNUM, G12_BP_SLUG, G12, G12_SLUG, G12_FLECHETTE, G12_MAGNUM, G12_EXPLOSIVE, G12_PHOSPHORUS, - G10, G10_SHRAPNEL, G10_DU, G10_SLUG, + G10, G10_SHRAPNEL, G10_DU, G10_SLUG, G10_EXPLOSIVE, G26_FLARE, G26_FLARE_SUPPLY, G26_FLARE_WEAPON, G40_HE, G40_HEAT, G40_DEMO, G40_INC, G40_PHOSPHORUS, ROCKET_HE, ROCKET_HEAT, ROCKET_DEMO, ROCKET_INC, ROCKET_PHOSPHORUS, diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java index ef840553e..4aeeed591 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/GunFactoryClient.java @@ -170,6 +170,7 @@ public class GunFactoryClient { g10_shrapnel.setRenderer(LegoClient.RENDER_STANDARD_BULLET); g10_du.setRenderer(LegoClient.RENDER_DU_BULLET); g10_slug.setRenderer(LegoClient.RENDER_STANDARD_BULLET); + g10_explosive.setRenderer(LegoClient.RENDER_HE_BULLET); g26_flare.setRenderer(LegoClient.RENDER_FLARE); g26_flare_supply.setRenderer(LegoClient.RENDER_FLARE_SUPPLY); diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java index 85165ea5c..e875b7800 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory10ga.java @@ -3,6 +3,7 @@ package com.hbm.items.weapon.sedna.factory; import java.util.function.BiConsumer; import java.util.function.BiFunction; +import com.hbm.entity.projectile.EntityBulletBaseMK4; import com.hbm.items.ModItems; import com.hbm.items.ItemEnums.EnumCasingType; import com.hbm.items.weapon.sedna.BulletConfig; @@ -22,6 +23,7 @@ import com.hbm.render.anim.BusAnimationKeyframe.IType; import com.hbm.render.anim.HbmAnimations.AnimType; import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; public class XFactory10ga { @@ -29,6 +31,12 @@ public class XFactory10ga { public static BulletConfig g10_shrapnel; public static BulletConfig g10_du; public static BulletConfig g10_slug; + public static BulletConfig g10_explosive; + + public static BiConsumer LAMBDA_TINY_EXPLODE = (bullet, mop) -> { + if(mop.typeOfHit == mop.typeOfHit.ENTITY && bullet.ticksExisted < 3 && mop.entityHit == bullet.getThrower()) return; + Lego.tinyExplode(bullet, mop, 2F); bullet.setDead(); + }; public static void init() { @@ -37,12 +45,13 @@ public class XFactory10ga { g10_shrapnel = new BulletConfig().setItem(EnumAmmo.G10_SHRAPNEL).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 4).setProjectiles(10).setDamage(1F/10F).setSpread(buckshotSpread).setRicochetAngle(90).setRicochetCount(15).setThresholdNegation(5F).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xE5DD00, SpentCasing.COLOR_CASE_12GA).setScale(1F).register("10GAShrapnel")); g10_du = new BulletConfig().setItem(EnumAmmo.G10_DU).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 4).setProjectiles(10).setDamage(1F/4F).setSpread(buckshotSpread).setRicochetAngle(15).setThresholdNegation(10F).setArmorPiercing(0.2F).setDoesPenetrate(true).setDamageFalloutByPen(false).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x538D53, SpentCasing.COLOR_CASE_12GA).setScale(1F).register("10GADU")); g10_slug = new BulletConfig().setItem(EnumAmmo.G10_SLUG).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 4).setRicochetAngle(15).setThresholdNegation(10F).setArmorPiercing(0.1F).setDoesPenetrate(true).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0x808080, SpentCasing.COLOR_CASE_12GA).setScale(1F).register("10GASlug")); + g10_explosive = new BulletConfig().setItem(EnumAmmo.G10_EXPLOSIVE).setCasing(EnumCasingType.BUCKSHOT_ADVANCED, 4).setWear(3F).setProjectiles(10).setDamage(1F/4F).setSpread(buckshotSpread).setCasing(new SpentCasing(CasingType.SHOTGUN).setColor(0xFAC943, SpentCasing.COLOR_CASE_12GA).setScale(1F).register("10GAEXP")).setOnImpact(LAMBDA_TINY_EXPLODE); ModItems.gun_double_barrel = new ItemGunBaseNT(WeaponQuality.SPECIAL, new GunConfig() .dura(1000).draw(10).inspect(39).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) .dmg(30F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound("hbm:weapon.fire.shotgun", 1.0F, 0.9F) - .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug)) + .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug, g10_explosive)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL)) .setupStandardConfiguration() @@ -52,7 +61,7 @@ public class XFactory10ga { .dura(6000).draw(10).inspect(39).crosshair(Crosshair.L_CIRCLE).smoke(Lego.LAMBDA_STANDARD_SMOKE) .rec(new Receiver(0) .dmg(45F).spreadAmmo(1.35F).rounds(2).delay(10).reload(41).reloadOnEmpty(true).sound("hbm:weapon.fire.shotgun", 1.0F, 0.9F) - .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug)) + .mag(new MagazineFullReload(0, 2).addConfigs(g10, g10_shrapnel, g10_du, g10_slug, g10_explosive)) .offset(0.75, -0.0625, -0.1875) .setupStandardFire().recoil(LAMBDA_RECOIL_DOUBLE_BARREL)) .setupStandardConfiguration() diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java index 6ec2b755b..1dded0aab 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory50.java @@ -51,7 +51,7 @@ public class XFactory50 { .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50ap")); bmg50_du = new BulletConfig().setItem(EnumAmmo.BMG50_DU).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(21F).setArmorPiercing(0.25F) .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50du")); - bmg50_he = new BulletConfig().setItem(EnumAmmo.BMG50_HE).setCasing(EnumCasingType.LARGE_STEEL, 12).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2F).setOnImpact(LAMBDA_STANDARD_EXPLODE) + bmg50_he = new BulletConfig().setItem(EnumAmmo.BMG50_HE).setCasing(EnumCasingType.LARGE_STEEL, 12).setWear(3F).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2F).setOnImpact(LAMBDA_STANDARD_EXPLODE) .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("bmg50he")); ModItems.gun_m2 = new ItemGunBaseNT(WeaponQuality.A_SIDE, new GunConfig() diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java index a22b2f24f..eb7b7b79e 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory762mm.java @@ -58,7 +58,7 @@ public class XFactory762mm { .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762ap")); r762_du = new BulletConfig().setItem(EnumAmmo.R762_DU).setCasing(EnumCasingType.SMALL_STEEL, 6).setDoesPenetrate(true).setDamageFalloutByPen(false).setDamage(2.5F).setThresholdNegation(15F).setArmorPiercing(0.25F) .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762du")); - r762_he = new BulletConfig().setItem(EnumAmmo.R762_HE).setCasing(EnumCasingType.SMALL_STEEL, 6).setDamage(2F).setOnImpact(LAMBDA_TINY_EXPLODE) + r762_he = new BulletConfig().setItem(EnumAmmo.R762_HE).setCasing(EnumCasingType.SMALL_STEEL, 6).setWear(3F).setDamage(2F).setOnImpact(LAMBDA_TINY_EXPLODE) .setCasing(casing762.clone().setColor(SpentCasing.COLOR_CASE_44).register("r762he")); energy_lacunae = new BulletConfig().setItem(EnumAmmo.CAPACITOR).setCasing(new ItemStack(ModItems.ingot_polymer, 2), 4 * 40).setupDamageClass(DamageClass.LASER).setBeam().setReloadCount(40).setSpread(0.0F).setLife(5).setRenderRotations(false).setOnBeamImpact(BulletConfig.LAMBDA_STANDARD_BEAM_HIT); diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 96a019726..e64f3cc36 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -3,8 +3,9 @@ package com.hbm.lib; import api.hbm.energymk2.IBatteryItem; import api.hbm.energymk2.IEnergyConnectorBlock; import api.hbm.energymk2.IEnergyConnectorMK2; -import api.hbm.fluid.IFluidConnector; -import api.hbm.fluid.IFluidConnectorBlock; +import api.hbm.fluidmk2.IFluidConnectorBlockMK2; +import api.hbm.fluidmk2.IFluidConnectorMK2; + import com.hbm.blocks.ModBlocks; import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.entity.projectile.EntityChopperMine; @@ -83,8 +84,8 @@ public class Library { Block b = world.getBlock(x, y, z); - if(b instanceof IFluidConnectorBlock) { - IFluidConnectorBlock con = (IFluidConnectorBlock) b; + if(b instanceof IFluidConnectorBlockMK2) { + IFluidConnectorBlockMK2 con = (IFluidConnectorBlockMK2) b; if(con.canConnect(type, world, x, y, z, dir.getOpposite() /* machine's connecting side */)) return true; @@ -92,8 +93,8 @@ public class Library { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof IFluidConnector) { - IFluidConnector con = (IFluidConnector) te; + if(te instanceof IFluidConnectorMK2) { + IFluidConnectorMK2 con = (IFluidConnectorMK2) te; if(con.canConnect(type, dir.getOpposite() /* machine's connecting side */)) return true; diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index 5272a545a..6f851c112 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -1088,6 +1088,9 @@ public class ModEventHandlerClient { return null; } + + public static boolean renderLodeStar = false; // GENUINELY shut the fuck up i'm not kidding + public static long lastStarCheck = 0L; @SideOnly(Side.CLIENT) @SubscribeEvent(priority = EventPriority.LOWEST) @@ -1118,6 +1121,24 @@ public class ModEventHandlerClient { world.provider.setSkyRenderer(new RenderNTMSkyboxChainloader(sky)); } } + + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + long millis = System.currentTimeMillis(); + + if(lastStarCheck + 200 < millis) { + renderLodeStar = false; // GENUINELY shut the fuck up i'm not kidding + lastStarCheck = millis; + + if(player != null) { // GENUINELY shut the fuck up i'm not kidding + Vec3NT pos = new Vec3NT(player.posX, player.posY, player.posZ); // GENUINELY shut the fuck up i'm not kidding + Vec3NT lodestarHeading = new Vec3NT(0, 0, -1D).rotateAroundXDeg(-15).multiply(25); // GENUINELY shut the fuck up i'm not kidding + Vec3NT nextPos = new Vec3NT(pos).add(lodestarHeading.xCoord,lodestarHeading.yCoord, lodestarHeading.zCoord); // GENUINELY shut the fuck up i'm not kidding + MovingObjectPosition mop = world.func_147447_a(pos, nextPos, false, true, false); // GENUINELY shut the fuck up i'm not kidding + if(mop != null && mop.typeOfHit == mop.typeOfHit.BLOCK && world.getBlock(mop.blockX, mop.blockY, mop.blockZ) == ModBlocks.glass_polarized) { // GENUINELY shut the fuck up i'm not kidding + renderLodeStar = true; // GENUINELY shut the fuck up i'm not kidding + } + } + } } if(event.phase == Phase.START) { @@ -1417,7 +1438,9 @@ public class ModEventHandlerClient { } } - if(event.phase == event.phase.END) ItemCustomLore.updateSystem(); + if(event.phase == event.phase.END) { + ItemCustomLore.updateSystem(); + } } @SubscribeEvent diff --git a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMAS36.java b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMAS36.java index d12175c1f..6dd2cd761 100644 --- a/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMAS36.java +++ b/src/main/java/com/hbm/render/item/weapon/sedna/ItemRenderMAS36.java @@ -76,9 +76,9 @@ public class ItemRenderMAS36 extends ItemRenderWeaponBase { GL11.glPopMatrix(); GL11.glPushMatrix(); - GL11.glTranslated(0, 1.125, 0); + GL11.glTranslated(0, 0.0625 * 18.5, 0); GL11.glRotated(boltTurn[2], 0, 0, 1); - GL11.glTranslated(0, -1.125, 0); + GL11.glTranslated(0, 0.0625 * -18.5, 0); GL11.glTranslated(0, 0, boltPull[2]); ResourceManager.mas36.renderPart("Bolt"); GL11.glPopMatrix(); diff --git a/src/main/java/com/hbm/render/world/RenderNTMSkyboxChainloader.java b/src/main/java/com/hbm/render/world/RenderNTMSkyboxChainloader.java index 1156015c6..09f4eba0c 100644 --- a/src/main/java/com/hbm/render/world/RenderNTMSkyboxChainloader.java +++ b/src/main/java/com/hbm/render/world/RenderNTMSkyboxChainloader.java @@ -3,6 +3,7 @@ package com.hbm.render.world; import org.lwjgl.opengl.GL11; import com.hbm.extprop.HbmLivingProps; +import com.hbm.main.ModEventHandlerClient; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.Minecraft; @@ -23,6 +24,7 @@ public class RenderNTMSkyboxChainloader extends IRenderHandler { //why an abstra private IRenderHandler parent; private static final ResourceLocation digammaStar = new ResourceLocation("hbm:textures/misc/star_digamma.png"); + private static final ResourceLocation lodeStar = new ResourceLocation("hbm:textures/misc/star_lode.png"); private static final ResourceLocation bobmazonSat = new ResourceLocation("hbm:textures/misc/sat_bobmazon.png"); /* @@ -54,6 +56,8 @@ public class RenderNTMSkyboxChainloader extends IRenderHandler { //why an abstra world.provider.setSkyRenderer(this); } + Tessellator tessellator = Tessellator.instance; + GL11.glPushMatrix(); GL11.glDepthMask(false); @@ -68,6 +72,25 @@ public class RenderNTMSkyboxChainloader extends IRenderHandler { //why an abstra GL11.glColor4f(brightness, brightness, brightness, 1.0F); + float var12 = 1F + world.rand.nextFloat() * 0.5F; + double dist = 100D; + + if(ModEventHandlerClient.renderLodeStar) { + GL11.glPushMatrix(); + GL11.glRotatef(-75.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 1.0F, 0.0F); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(lodeStar); // GENUINELY shut the fuck up i'm not kidding + + tessellator.startDrawingQuads(); + tessellator.addVertexWithUV(-var12, dist, -var12, 0.0D, 0.0D); + tessellator.addVertexWithUV(var12, dist, -var12, 0.0D, 1.0D); + tessellator.addVertexWithUV(var12, dist, var12, 1.0D, 1.0D); + tessellator.addVertexWithUV(-var12, dist, var12, 1.0D, 0.0D); + tessellator.draw(); + + GL11.glPopMatrix(); + } + GL11.glPushMatrix(); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); @@ -77,10 +100,9 @@ public class RenderNTMSkyboxChainloader extends IRenderHandler { //why an abstra FMLClientHandler.instance().getClient().renderEngine.bindTexture(digammaStar); float digamma = HbmLivingProps.getDigamma(Minecraft.getMinecraft().thePlayer); - float var12 = 1F * (1 + digamma * 0.25F); - double dist = 100D - digamma * 2.5; + var12 = 1F * (1 + digamma * 0.25F); + dist = 100D - digamma * 2.5; - Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV(-var12, dist, -var12, 0.0D, 0.0D); tessellator.addVertexWithUV(var12, dist, -var12, 0.0D, 1.0D); diff --git a/src/main/java/com/hbm/wiaj/cannery/Dummies.java b/src/main/java/com/hbm/wiaj/cannery/Dummies.java index 2ecfd0c38..839373ddf 100644 --- a/src/main/java/com/hbm/wiaj/cannery/Dummies.java +++ b/src/main/java/com/hbm/wiaj/cannery/Dummies.java @@ -1,11 +1,10 @@ package com.hbm.wiaj.cannery; - import api.hbm.energymk2.IEnergyConnectorMK2; -import api.hbm.fluid.IFluidConnector; +import api.hbm.fluidmk2.IFluidConnectorMK2; import net.minecraft.tileentity.TileEntity; public class Dummies { - public static class JarDummyConnector extends TileEntity implements IEnergyConnectorMK2, IFluidConnector { } + public static class JarDummyConnector extends TileEntity implements IEnergyConnectorMK2, IFluidConnectorMK2 { } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index b9ead782f..1bc9ed130 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -1209,6 +1209,7 @@ item.ammo_standard.b75_exp.name=.75 Bolzen (Explosiv) item.ammo_standard.b75_inc.name=.75 Bolzen (Brand) item.ammo_standard.bmg50_ap.name=.50 BMG Patrone (Panzerbrechend) item.ammo_standard.bmg50_du.name=.50 BMG Patrone (Urangeschoss) +item.ammo_standard.bmg50_he.name=.50 BMG Patrone (Explosiv) item.ammo_standard.bmg50_fmj.name=.50 BMG Patrone (Vollmantelgeschoss) item.ammo_standard.bmg50_jhp.name=.50 BMG Patrone (Hohlspitz) item.ammo_standard.bmg50_sp.name=.50 BMG Patrone (Teilmantelgeschoss) @@ -1223,6 +1224,7 @@ item.ammo_standard.flame_gas.name=Flammenwerferbrennstoff, Gas item.ammo_standard.flame_napalm.name=Flammenwerferbrennstoff, Napalm item.ammo_standard.g10.name=Kaliber 10 Schrot item.ammo_standard.g10_du.name=Kaliber 10 Uranschrot +item.ammo_standard.g10_explosive.name=Kaliber 10 Explosivschrot item.ammo_standard.g10_shrapnel.name=Kaliber 10 Schrapnell-Schrot item.ammo_standard.g10_slug.name=Kaliber 10 Laufgeschoss item.ammo_standard.g12.name=Kaliber 12 Schrot diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 4199f185f..920b175a6 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1933,6 +1933,7 @@ item.ammo_standard.b75_exp.name=.75 Bolt (Explosive) item.ammo_standard.b75_inc.name=.75 Bolt (Incendiary) item.ammo_standard.bmg50_ap.name=.50 BMG Round (Armor Piercing) item.ammo_standard.bmg50_du.name=.50 BMG Round (Depleted Uranium) +item.ammo_standard.bmg50_he.name=.50 BMG Round (High-Explosive) item.ammo_standard.bmg50_fmj.name=.50 BMG Round (Full Metal Jacket) item.ammo_standard.bmg50_jhp.name=.50 BMG Round (Jacketed Hollow Point) item.ammo_standard.bmg50_sp.name=.50 BMG Round (Soft Point) @@ -1947,6 +1948,7 @@ item.ammo_standard.flame_gas.name=Flamer Fuel, Gas item.ammo_standard.flame_napalm.name=Flamer Fuel, Napalm item.ammo_standard.g10.name=10 Gauge Buckshot item.ammo_standard.g10_du.name=10 Gauge Uranium Buckshot +item.ammo_standard.g10_explosive.name=10 Gauge Explosive Buckshot item.ammo_standard.g10_shrapnel.name=10 Gauge Shrapnel Buckshot item.ammo_standard.g10_slug.name=10 Gauge Slug item.ammo_standard.g12.name=12 Gauge Buckshot diff --git a/src/main/resources/assets/hbm/textures/items/ammo.png b/src/main/resources/assets/hbm/textures/items/ammo.png index 1359f4762..f2a4ac28e 100644 Binary files a/src/main/resources/assets/hbm/textures/items/ammo.png and b/src/main/resources/assets/hbm/textures/items/ammo.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ammo_standard.g10_explosive.png b/src/main/resources/assets/hbm/textures/items/ammo_standard.g10_explosive.png new file mode 100644 index 000000000..b74aab007 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ammo_standard.g10_explosive.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ammo_standard.g12_explosive_pellet.png b/src/main/resources/assets/hbm/textures/items/ammo_standard.g12_explosive_pellet.png new file mode 100644 index 000000000..c746a13dd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ammo_standard.g12_explosive_pellet.png differ diff --git a/src/main/resources/assets/hbm/textures/misc/star_bober_what_is_this_please_reveal_all_secrets_to_me.png b/src/main/resources/assets/hbm/textures/misc/star_lode.png similarity index 100% rename from src/main/resources/assets/hbm/textures/misc/star_bober_what_is_this_please_reveal_all_secrets_to_me.png rename to src/main/resources/assets/hbm/textures/misc/star_lode.png