From ca1cd3db17d1977689507ba9b5b1334ed85ff5c1 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 25 Dec 2023 00:08:26 +0100 Subject: [PATCH] and some more fixes --- changelog | 14 +++++++++++++- gradle.properties | 2 +- .../hbm/blocks/generic/BlockDoorGeneric.java | 5 +++++ .../java/com/hbm/handler/CasingEjector.java | 11 ++++------- .../hbm/handler/guncfg/Gun12GaugeFactory.java | 2 +- .../java/com/hbm/inventory/OreDictManager.java | 2 +- .../java/com/hbm/inventory/fluid/Fluids.java | 6 +++--- .../recipes/ExposureChamberRecipes.java | 4 +++- src/main/java/com/hbm/items/ModItems.java | 4 ++-- .../hbm/items/tool/ItemPollutionDetector.java | 6 +++--- src/main/java/com/hbm/lib/HbmWorldGen.java | 10 ++++++++++ src/main/java/com/hbm/lib/RefStrings.java | 2 +- .../hbm/render/item/weapon/ItemRenderM2.java | 5 +++-- .../tileentity/bomb/TileEntityLaunchPad.java | 3 +++ .../machine/TileEntityMachineArcWelder.java | 2 +- .../turret/TileEntityTurretArty.java | 16 ---------------- .../turret/TileEntityTurretBaseArtillery.java | 17 +++++++++++++++++ .../hbm/textures/items/dynosphere_base.png | Bin 218 -> 0 bytes .../hbm/textures/items/dynosphere_desh.png | Bin 375 -> 0 bytes .../textures/items/dynosphere_desh_charged.png | Bin 495 -> 0 bytes .../textures/items/dynosphere_dineutronium.png | Bin 392 -> 0 bytes .../items/dynosphere_dineutronium_charged.png | Bin 553 -> 0 bytes .../textures/items/dynosphere_euphemium.png | Bin 407 -> 0 bytes .../items/dynosphere_euphemium_charged.png | Bin 568 -> 0 bytes .../textures/items/dynosphere_schrabidium.png | Bin 383 -> 0 bytes .../items/dynosphere_schrabidium_charged.png | Bin 486 -> 0 bytes .../items/dynosphere_tetraneutronium.png | Bin 296 -> 0 bytes .../dynosphere_tetraneutronium_charged.png | Bin 274 -> 0 bytes .../assets/hbm/textures/items/gun_bf_ammo.png | Bin 297 -> 549 bytes 29 files changed, 71 insertions(+), 40 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_base.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_desh.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_desh_charged.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_dineutronium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_dineutronium_charged.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_euphemium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_euphemium_charged.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium_charged.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_tetraneutronium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/dynosphere_tetraneutronium_charged.png diff --git a/changelog b/changelog index 3edae6c41..b35e9997a 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,21 @@ ## Added +* ??? ## Changed * Adjusted the model for the mining helmet * The ladders on the acidizer and fluid tanks are now climbable * Removed those unused blue dungeon bricks +* Red phosphorus is no longer pyrophoric, meaning that multi purpose bomb kits no longer instantly explode +* Adjusted M2's rotations ## Fixed -* Fixed recipe conflict in the arc welder with the medium and large missile fuel tanks \ No newline at end of file +* Fixed recipe conflict in the arc welder with the medium and large missile fuel tanks +* Fixed doomsday missile not being launchable +* Fixed rocket artillery turret power connectors not working with cables +* Fixed arc welder energy consumption check not taking upgrades into account +* Fixed glyphid gland and 16k item barrels not having a proper container item set, effectively voiding the emtpy container when used in crafting +* Fixed confusing item quantity display in the exposure chamber's NEI handler +* Fixed pheromone being tagged as viscous and therefore not being dispersable, making modified pheromone useless +* Fixed mobs not being able to pathfind through open doors +* Fixed the benelli ejecting the casings wrong +* Fixed casing ejection in general being inconsistent, sometimes flying off into the wrong direction \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d52227a0b..5c90623a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=4816 +mod_build_number=4824 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\ diff --git a/src/main/java/com/hbm/blocks/generic/BlockDoorGeneric.java b/src/main/java/com/hbm/blocks/generic/BlockDoorGeneric.java index ea3780a27..5d44d76f0 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockDoorGeneric.java +++ b/src/main/java/com/hbm/blocks/generic/BlockDoorGeneric.java @@ -91,6 +91,11 @@ public class BlockDoorGeneric extends BlockDummyable { // return; //super.addCollisionBoxesToList(worldIn, x, y, z, entityBox, collidingBoxes, entityIn); } + + @Override //should fix AI pathfinding + public boolean getBlocksMovement(IBlockAccess world, int x, int y, int z) { //btw the method name is the exact opposite of that it's doing, check net.minecraft.pathfinding.PathNavigate#512 + return hasExtra(world.getBlockMetadata(x, y, z)); //if it's open + } @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block blockIn){ diff --git a/src/main/java/com/hbm/handler/CasingEjector.java b/src/main/java/com/hbm/handler/CasingEjector.java index 72ec13a3a..94dd08a92 100644 --- a/src/main/java/com/hbm/handler/CasingEjector.java +++ b/src/main/java/com/hbm/handler/CasingEjector.java @@ -127,20 +127,17 @@ public class CasingEjector implements Cloneable { } private static Vec3 rotateVector(Vec3 vector, float pitch, float yaw, float pitchFactor, float yawFactor) { - // Apply randomness to vector - vector.xCoord += rand.nextGaussian() * yawFactor; - vector.yCoord += rand.nextGaussian() * pitchFactor; - vector.zCoord += rand.nextGaussian() * yawFactor; final Matrix4f pitchMatrix = new Matrix4f(), yawMatrix = new Matrix4f(); pitchMatrix.setIdentity(); - pitchMatrix.rotate(-pitch, new Vector3f(1, 0, 0)); + pitchMatrix.rotate(pitch, new Vector3f(1, 0, 0)); yawMatrix.setIdentity(); yawMatrix.rotate(-yaw, new Vector3f(0, 1, 0)); - - final Vector4f vector4f = new Vector4f((float) vector.xCoord, (float) vector.yCoord, (float) vector.zCoord, 1); + + // Apply randomness to vector + final Vector4f vector4f = new Vector4f((float) (vector.xCoord + rand.nextGaussian() * yawFactor), (float) (vector.yCoord + rand.nextGaussian() * pitchFactor), (float) (vector.zCoord + rand.nextGaussian() * yawFactor), 1); Matrix4f.transform(pitchMatrix, vector4f, vector4f); Matrix4f.transform(yawMatrix, vector4f, vector4f); diff --git a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java index 0a31c1634..8f115d30f 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -39,7 +39,7 @@ public class Gun12GaugeFactory { static { EJECTOR_SPAS = new CasingEjector().setMotion(-0.4, 0.1, 0).setOffset(-0.35, 0, 0.5).setAngleRange(0.01F, 0.03F).setDelay(12); EJECTOR_SPAS_ALT = new CasingEjector().setMotion(-0.4, 0.1, 0).setOffset(-0.35, 0, 0.5).setAngleRange(0.01F, 0.03F).setDelay(12).setAmount(2); - EJECTOR_BENELLI = new CasingEjector().setMotion(-0.4, 0.1, 0).setOffset(-0.3, 1, 0).setAngleRange(0.01F, 0.03F); + EJECTOR_BENELLI = new CasingEjector().setMotion(-0.4, 0.3, 0).setOffset(-0.3, 0, 0.5).setAngleRange(0.01F, 0.03F); EJECTOR_UBOINIK = new CasingEjector().setMotion(-0.4, 0.1, 0).setOffset(-0.35, -0.3, 0.5).setAngleRange(0.01F, 0.03F); EJECTOR_SSG = new CasingEjector().setMotion(0.2, 0, -0.2).setOffset(0.8, 0, 0).setAngleRange(0.05F, 0.02F).setDelay(20).setAmount(2); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index 348f1704c..211c4cab1 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -422,7 +422,7 @@ public class OreDictManager { * PHOSPHORUS */ P_WHITE .hot(5) .ingot(ingot_phosphorus) .block(block_white_phosphorus); - P_RED .hot(2) .dust(powder_fire) .block(block_red_phosphorus); + P_RED .dust(powder_fire) .block(block_red_phosphorus); /* * RARE METALS diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java index edc8be8f0..2669476ed 100644 --- a/src/main/java/com/hbm/inventory/fluid/Fluids.java +++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java @@ -331,9 +331,9 @@ public class Fluids { THORIUM_SALT = new FluidType("THORIUM_SALT", 0x7A5542, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, VISCOUS, new FT_Corrosive(65)); THORIUM_SALT_HOT = new FluidType("THORIUM_SALT_HOT", 0x3E3627, 2, 0, 3, EnumSymbol.NONE).setTemp(1600).addTraits(LIQUID, VISCOUS, new FT_Corrosive(65)); THORIUM_SALT_DEPLETED = new FluidType("THORIUM_SALT_DEPLETED", 0x302D1C, 2, 0, 3, EnumSymbol.NONE).setTemp(800).addTraits(LIQUID, VISCOUS, new FT_Corrosive(65)); - FULLERENE = new FluidType("FULLERENE", 0xFF7FED, 3, 3, 3, EnumSymbol.NONE).addTraits(LIQUID, new FT_Corrosive(65)); - PHEROMONE = new FluidType("PHEROMONE", 0x5FA6E8, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, new FT_Pheromone(1)); - PHEROMONE_M = new FluidType(132, "PHEROMONE_M", 0x48C9B0 , 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, VISCOUS, new FT_Pheromone(2)); + FULLERENE = new FluidType("FULLERENE", 0xFF7FED, 3, 3, 3, EnumSymbol.NONE).addTraits(LIQUID, new FT_Corrosive(65)); + PHEROMONE = new FluidType("PHEROMONE", 0x5FA6E8, 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, new FT_Pheromone(1)); + PHEROMONE_M = new FluidType(132, "PHEROMONE_M", 0x48C9B0 , 0, 0, 0, EnumSymbol.NONE).addTraits(LIQUID, new FT_Pheromone(2)); // ^ ^ ^ ^ ^ ^ ^ ^ //ADD NEW FLUIDS HERE diff --git a/src/main/java/com/hbm/inventory/recipes/ExposureChamberRecipes.java b/src/main/java/com/hbm/inventory/recipes/ExposureChamberRecipes.java index cb42e3140..5cee1cb84 100644 --- a/src/main/java/com/hbm/inventory/recipes/ExposureChamberRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ExposureChamberRecipes.java @@ -46,8 +46,10 @@ public class ExposureChamberRecipes extends SerializableRecipe { AStack stack = recipe.ingredient.copy(); stack.stacksize = 8; array[0] = stack; + ItemStack output = recipe.output.copy(); + output.stackSize = 8; - recipes.put(array, recipe.output); + recipes.put(array, output); } return recipes; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index d91f9821f..6e76aa0d7 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -4647,15 +4647,15 @@ public class ModItems { fluid_tank_full = new ItemFluidTank().setUnlocalizedName("fluid_tank_full").setContainerItem(ModItems.fluid_tank_empty).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_tank"); fluid_tank_lead_empty = new Item().setUnlocalizedName("fluid_tank_lead_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_tank_lead"); fluid_tank_lead_full = new ItemFluidTank().setUnlocalizedName("fluid_tank_lead_full").setContainerItem(ModItems.fluid_tank_lead_empty).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_tank_lead"); - fluid_barrel_full = new ItemFluidTank().setUnlocalizedName("fluid_barrel_full").setContainerItem(ModItems.fluid_barrel_empty).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel"); fluid_barrel_empty = new Item().setUnlocalizedName("fluid_barrel_empty").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel"); + fluid_barrel_full = new ItemFluidTank().setUnlocalizedName("fluid_barrel_full").setContainerItem(ModItems.fluid_barrel_empty).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel"); fluid_barrel_infinite = new ItemInfiniteFluid(null, 1_000_000_000).setUnlocalizedName("fluid_barrel_infinite").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":fluid_barrel_infinite"); disperser_canister_empty = new Item().setUnlocalizedName("disperser_canister_empty").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":disperser_canister"); disperser_canister = new ItemDisperser().setUnlocalizedName("disperser_canister").setContainerItem(ModItems.disperser_canister_empty).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":disperser_canister"); - glyphid_gland = new ItemDisperser().setUnlocalizedName("glyphid_gland").setContainerItem(ModItems.glyphid_gland_empty).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":glyphid_gland"); glyphid_gland_empty = new Item().setUnlocalizedName("glyphid_gland_empty").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":glyphid_gland"); + glyphid_gland = new ItemDisperser().setUnlocalizedName("glyphid_gland").setContainerItem(ModItems.glyphid_gland_empty).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":glyphid_gland"); siren_track = new ItemCassette().setUnlocalizedName("siren_track").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":cassette"); fluid_duct = new ItemFluidDuct().setUnlocalizedName("fluid_duct").setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":duct"); diff --git a/src/main/java/com/hbm/items/tool/ItemPollutionDetector.java b/src/main/java/com/hbm/items/tool/ItemPollutionDetector.java index 4ff3cc55f..1776249cf 100644 --- a/src/main/java/com/hbm/items/tool/ItemPollutionDetector.java +++ b/src/main/java/com/hbm/items/tool/ItemPollutionDetector.java @@ -27,16 +27,16 @@ public class ItemPollutionDetector extends Item { float soot = data.pollution[PollutionType.SOOT.ordinal()]; float poison = data.pollution[PollutionType.POISON.ordinal()]; float heavymetal = data.pollution[PollutionType.HEAVYMETAL.ordinal()]; - float fallout = data.pollution[PollutionType.FALLOUT.ordinal()]; + //float fallout = data.pollution[PollutionType.FALLOUT.ordinal()]; soot = ((int) (soot * 100)) / 100F; poison = ((int) (poison * 100)) / 100F; heavymetal = ((int) (heavymetal * 100)) / 100F; - fallout = ((int) (fallout * 100)) / 100F; + //fallout = ((int) (fallout * 100)) / 100F; PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(ChatBuilder.start("Soot: " + soot).color(EnumChatFormatting.YELLOW).flush(), 100, 4000), (EntityPlayerMP) entity); PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(ChatBuilder.start("Poison: " + poison).color(EnumChatFormatting.YELLOW).flush(), 101, 4000), (EntityPlayerMP) entity); PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(ChatBuilder.start("Heavy metal: " + heavymetal).color(EnumChatFormatting.YELLOW).flush(), 102, 4000), (EntityPlayerMP) entity); - PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(ChatBuilder.start("Fallout: " + fallout).color(EnumChatFormatting.YELLOW).flush(), 103, 4000), (EntityPlayerMP) entity); + //PacketDispatcher.wrapper.sendTo(new PlayerInformPacket(ChatBuilder.start("Fallout: " + fallout).color(EnumChatFormatting.YELLOW).flush(), 103, 4000), (EntityPlayerMP) entity); } } diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index d4bb78bc6..1ae86289b 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -741,6 +741,16 @@ public class HbmWorldGen implements IWorldGenerator { } } } + + if(rand.nextInt(4) == 0) { + int x = i + rand.nextInt(16) + 8; + int y = 6 + rand.nextInt(13); + int z = j + rand.nextInt(16) + 8; + + if(world.getBlock(x, y, z).isReplaceableOreGen(world, x, y, z, Blocks.stone)) { + world.setBlock(x, y, z, ModBlocks.stone_keyhole); + } + } } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 40d84cd27..12297eb61 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/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 (4816)"; + public static final String VERSION = "1.0.27 BETA (4824)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java index 519caa36d..b4b01c472 100644 --- a/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderM2.java @@ -30,11 +30,11 @@ public class ItemRenderM2 extends ItemRenderBase { GL11.glRotatef(30, 1, 0, 0); break; case EQUIPPED_FIRST_PERSON: - GL11.glRotatef(-90, 0, 1, 0); if (Minecraft.getMinecraft().thePlayer.isSneaking()) { + GL11.glRotatef(-90, 0, 1, 0); GL11.glTranslatef(-0.96f, -0.9f, -2); - GL11.glRotatef(-5.6f, 0, 1, 1); + GL11.glRotatef(-5.75f, 0, 1, 1);// Just of by 0.15 /* vvv remove to restore original look vvv */ GL11.glRotatef(1.9F, 0, 0, 1); @@ -44,6 +44,7 @@ public class ItemRenderM2 extends ItemRenderBase { GL11.glTranslatef(0, 1.15F, -1.75F); } else { + GL11.glRotatef(-95, 0, 1, 0); GL11.glTranslatef(0, -1, -3); } GL11.glRotatef(25, 1, 0, 0); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java index 676409778..aa3ae9816 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPad.java @@ -10,6 +10,7 @@ import com.hbm.config.GeneralConfig; import com.hbm.entity.missile.EntityCarrier; import com.hbm.entity.missile.EntityMissileAntiBallistic; import com.hbm.entity.missile.EntityMissileBaseNT; +import com.hbm.entity.missile.EntityMissileDoomsday; import com.hbm.entity.missile.EntityMissileShuttle; import com.hbm.entity.missile.EntityMissileTier0.*; import com.hbm.entity.missile.EntityMissileTier1.*; @@ -87,6 +88,8 @@ public class TileEntityLaunchPad extends TileEntityMachineBase implements IEnerg missiles.put(new ComparableStack(ModItems.missile_nuclear), EntityMissileNuclear.class); missiles.put(new ComparableStack(ModItems.missile_nuclear_cluster), EntityMissileMirv.class); missiles.put(new ComparableStack(ModItems.missile_volcano), EntityMissileVolcano.class); + + missiles.put(new ComparableStack(ModItems.missile_doomsday), EntityMissileDoomsday.class); } public ItemStack toRender; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcWelder.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcWelder.java index d6211169b..8bcfe28db 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcWelder.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcWelder.java @@ -142,7 +142,7 @@ public class TileEntityMachineArcWelder extends TileEntityMachineBase implements public boolean canProcess(ArcWelderRecipe recipe) { - if(this.power < recipe.consumption) return false; + if(this.power < this.consumption) return false; if(recipe.fluid != null) { if(this.tank.getTankType() != recipe.fluid.type) return false; diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java index c479982db..3b9c8d3ec 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java @@ -3,7 +3,6 @@ package com.hbm.tileentity.turret; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.BlockDummyable; import com.hbm.entity.projectile.EntityArtilleryShell; import com.hbm.handler.CasingEjector; import com.hbm.inventory.container.ContainerTurretBase; @@ -27,7 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class TileEntityTurretArty extends TileEntityTurretBaseArtillery implements IGUIProvider { @@ -221,20 +219,6 @@ public class TileEntityTurretArty extends TileEntityTurretBaseArtillery implemen return 7; } - protected void updateConnections() { - ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset).getOpposite(); - ForgeDirection rot = dir.getRotation(ForgeDirection.UP); - - for(int i = 0; i < 2; i++) { - for(int j = 0; j < 4; j++) { - this.trySubscribe(worldObj, xCoord + dir.offsetX * (-1 + j) + rot.offsetX * -3, yCoord + i, zCoord + dir.offsetZ * (-1 + j) + rot.offsetZ * -3, ForgeDirection.SOUTH); - this.trySubscribe(worldObj, xCoord + dir.offsetX * (-1 + j) + rot.offsetX * 2, yCoord + i, zCoord + dir.offsetZ * (-1 + j) + rot.offsetZ * 2, ForgeDirection.NORTH); - this.trySubscribe(worldObj, xCoord + dir.offsetX * -2 + rot.offsetX * (1 - j), yCoord + i, zCoord + dir.offsetZ * -2 + rot.offsetZ * (1 - j), ForgeDirection.EAST); - this.trySubscribe(worldObj, xCoord + dir.offsetX * 3 + rot.offsetX * (1 - j), yCoord + i, zCoord + dir.offsetZ * 3 + rot.offsetZ * (1 - j), ForgeDirection.WEST); - } - } - } - @Override public void updateEntity() { diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java index 4257d55b6..f4866fe7a 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java @@ -3,10 +3,12 @@ package com.hbm.tileentity.turret; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.BlockDummyable; import com.hbm.tileentity.IRadarCommandReceiver; import net.minecraft.entity.Entity; import net.minecraft.util.Vec3; +import net.minecraftforge.common.util.ForgeDirection; public abstract class TileEntityTurretBaseArtillery extends TileEntityTurretBaseNT implements IRadarCommandReceiver { @@ -52,4 +54,19 @@ public abstract class TileEntityTurretBaseArtillery extends TileEntityTurretBase return height < (e.posY + e.height); } } + + @Override + protected void updateConnections() { + ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset).getOpposite(); + ForgeDirection rot = dir.getRotation(ForgeDirection.UP); + + for(int i = 0; i < 2; i++) { + for(int j = 0; j < 4; j++) { + this.trySubscribe(worldObj, xCoord + dir.offsetX * (-1 + j) + rot.offsetX * -3, yCoord + i, zCoord + dir.offsetZ * (-1 + j) + rot.offsetZ * -3, ForgeDirection.SOUTH); + this.trySubscribe(worldObj, xCoord + dir.offsetX * (-1 + j) + rot.offsetX * 2, yCoord + i, zCoord + dir.offsetZ * (-1 + j) + rot.offsetZ * 2, ForgeDirection.NORTH); + this.trySubscribe(worldObj, xCoord + dir.offsetX * -2 + rot.offsetX * (1 - j), yCoord + i, zCoord + dir.offsetZ * -2 + rot.offsetZ * (1 - j), ForgeDirection.EAST); + this.trySubscribe(worldObj, xCoord + dir.offsetX * 3 + rot.offsetX * (1 - j), yCoord + i, zCoord + dir.offsetZ * 3 + rot.offsetZ * (1 - j), ForgeDirection.WEST); + } + } + } } diff --git a/src/main/resources/assets/hbm/textures/items/dynosphere_base.png b/src/main/resources/assets/hbm/textures/items/dynosphere_base.png deleted file mode 100644 index 8bc3b3769dd5760e1b0579243ac015848ba37e27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 218 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 diff --git a/src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium.png b/src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium.png deleted file mode 100644 index 8204ae217bfc4e25c0520125554c2fa6a9c43426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sEXgD|57Yp@DXgNUb#V~B5myO2-M?=Pb)S1fD0lc1~P+eI9&x~D&0ch!~M-eQtmt^Q8$*D9V)`!581%(g2t zh}LI0{g{GnFaHXCo5f7)$+dgeyQg1RTE2DI<_aCc;qOs$1L$vO#8)- zbB7guA4in4y(<5(hU25!dCT(6J=`{UXKX${2;G1jU3)@$$2md{}B;d1Eca#++6DC=%;kxhc% zEp#o%M9IBZyPgFuanF=@WZcNnFf)83&jr@FV@|7u81?v0ui>++J0&r-@^bP0l+XkKTE3E9 diff --git a/src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium_charged.png b/src/main/resources/assets/hbm/textures/items/dynosphere_schrabidium_charged.png deleted file mode 100644 index 9d6c031460c1a95e2b537ebe551ef8a6d8f29f84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0eeYAK~y+TrBb_2 zLO~Rqy({vjr>4*jqlwxOK7kHC76=`MQfRL>gbKnVgy(&%bCwI<3zGPlWV0-LX3m+} ztBf)D51erSGtN$M-)b496zuKgC7vo3WiO6!BJj{|n?xc3luB??DFmAhz#6~bhv&L@ zJ`#!v2su?QL$UCxSj5|8VkeO0t=I4u3v34i^s3c^NGt;_ok_kX`C~eT@;s>V7@Afz z|92>&wGOLyI0%SmhhuAw{T`BaG6^T0wxWt;C!4kFmXn6G$OP=7NH*Io0wFLse>9?f z12dZeaz_hhx!j#Y90a7$21cR{Z9WI`d4QdT3=(Z!5CF15d6M@Ud5T>~_sXp#aU!YPEtyZ8(A9Q~}8z?YYAtdbQg3ui(Fmrz93>R)54^0oW>`uC-W15D@_KJilBaD^j~J28f~vfFwx(D9e)BbnbK~6>9NkD_}Bu;`_Hp z5Do#QgF#gfxZVo?!GVFQx~IQ&`>emV4BL+k!oT#ZkQJ$2ZI*Uxf846^nm*fO{z(N@ urK&0bIvAHcet+=>o*kt94{I8vJHQSO=TSD9>#=eG0000{^_D06ElyfhW)1~V-*JTF; zO;4}*{!aGr_xJY$P2}xrW)$eu{P{6);r8v~>jWc>%^J)V6{|VJouq(1^qQ8xXwvM9 RFMyt6@O1TaS?83{1OO9vZax42 diff --git a/src/main/resources/assets/hbm/textures/items/gun_bf_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_bf_ammo.png index cb8f06db88fbb187f679f8b9dc4055be599f22f6..a7e2968c4378f8fcd17626b5ee3068b26f54d3b7 100644 GIT binary patch delta 508 zcmV!DBDTzsAvlK-nbZS93 z2#U8w#I1rLh!h7Got(r?Hy1&77jeqqq7I4E6cH99YzfY^}GV*-h-QO7BI*ucExqrS(u0J|2tBn=1Q(-P# z+J{LJP1>{rX!>8c2U3_GieeJH2HUoOe{l8Tf;_c&63eV{ki!U)cyy`mEc4>?3j3`r zg;bi&eubxxKd}9L8X*Mba#>N2-_FScM*|9`MTv_fm_;MXPcE47xPiRb*gbhqONe*Xyk&jn*nPGvJ5($eYR< zB051nmE-$%i`BJHNGX|$7qC)M`YvM&0Q$?j>x%E|GIe%ynz-;dlAgoYVStbC`50=L zT(ZcSnME{3=gG5IKztnHxZAULO0qX-lbVdObnOH}wFv2PB7}%(1y0|%LL_7m$bj(s yB8Fk?J)~o|@={YJo-a{Vjh&Il+dYQ#AK(|b5w>)^Q5pvT0000b;@5JjIYZDWrRQ?Li1po)9|OPs-JIA0Dx zO&bYO_yVaof+@Dy&O(y{tpqrUZIoZFR+_i}?;rRtZN4_!~UBi{|9(U;b9+(zq@WOo@=N!w= z<)3l#=ZhF)mK?}lMx6`*39|TD0Pt!%HwPl7s-~*eG|i8I(O(u3tE!5kC@9O4wrwZ1 zGf-XErmE(>f7sZ`q~~_vwkNZ!+(SYL^J65)OM}1Z8zSgUqWl{e=Kufz07*qoM6N<$ Ef}s3$TL1t6