From a1401b47e2afaecc9a5189fa254766f13cc18222 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 16 Oct 2024 17:00:07 +0200 Subject: [PATCH] my ass is bleeding --- .../api/hbm/energymk2/IEnergyReceiverMK2.java | 2 ++ .../java/api/hbm/energymk2/Nodespace.java | 4 ++- .../java/com/hbm/config/MachineDynConfig.java | 2 ++ .../entity/mob/siege/EntitySiegeTunneler.java | 2 ++ .../com/hbm/interfaces/NotableComments.java | 7 +++++ .../com/hbm/inventory/OreDictManager.java | 2 ++ .../com/hbm/inventory/SlotNonRetarded.java | 3 ++ .../com/hbm/inventory/gui/GUIAutocrafter.java | 2 ++ .../java/com/hbm/items/block/ItemModSlab.java | 2 ++ .../weapon/sedna/factory/XFactory9mm.java | 6 ++-- src/main/java/com/hbm/main/MainRegistry.java | 7 ----- ...lientEffectsAndParticleHandlingPacket.java | 2 ++ .../TileEntityMachineRotaryFurnace.java | 28 +++++++++++++++++++ .../network/TileEntityRequestNetwork.java | 2 ++ src/main/java/com/hbm/util/StatHelper.java | 3 ++ src/main/java/com/hbm/util/TrackerUtil.java | 3 ++ .../hbm/world/generator/JungleDungeon.java | 3 ++ 17 files changed, 69 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/hbm/interfaces/NotableComments.java diff --git a/src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java b/src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java index 27bcc21f2..6ff96df42 100644 --- a/src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java +++ b/src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java @@ -1,5 +1,6 @@ package api.hbm.energymk2; +import com.hbm.interfaces.NotableComments; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.toclient.AuxParticlePacketNT; import com.hbm.util.Compat; @@ -12,6 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; /** If it receives energy, use this */ +@NotableComments public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 { public default long transferPower(long power) { diff --git a/src/main/java/api/hbm/energymk2/Nodespace.java b/src/main/java/api/hbm/energymk2/Nodespace.java index cdc618f51..401664333 100644 --- a/src/main/java/api/hbm/energymk2/Nodespace.java +++ b/src/main/java/api/hbm/energymk2/Nodespace.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Map.Entry; import java.util.Set; +import com.hbm.interfaces.NotableComments; import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.DirPos; @@ -147,7 +148,8 @@ public class Nodespace { if(node != null) popNode(node); } } - + + @NotableComments public static class PowerNode { public BlockPos[] positions; diff --git a/src/main/java/com/hbm/config/MachineDynConfig.java b/src/main/java/com/hbm/config/MachineDynConfig.java index f88432905..beda03517 100644 --- a/src/main/java/com/hbm/config/MachineDynConfig.java +++ b/src/main/java/com/hbm/config/MachineDynConfig.java @@ -10,6 +10,7 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonWriter; +import com.hbm.interfaces.NotableComments; import com.hbm.main.MainRegistry; import com.hbm.tileentity.IConfigurableMachine; import com.hbm.tileentity.TileMappings; @@ -20,6 +21,7 @@ import com.hbm.tileentity.TileMappings; * tile entities from the registry automatically and generate config options. * @author hbm */ +@NotableComments public class MachineDynConfig { public static final Gson gson = new Gson(); diff --git a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeTunneler.java b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeTunneler.java index ff64a8476..00d85f351 100644 --- a/src/main/java/com/hbm/entity/mob/siege/EntitySiegeTunneler.java +++ b/src/main/java/com/hbm/entity/mob/siege/EntitySiegeTunneler.java @@ -1,6 +1,7 @@ package com.hbm.entity.mob.siege; import com.hbm.entity.mob.EntityBurrowingSwingingBase; +import com.hbm.interfaces.NotableComments; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; @@ -21,6 +22,7 @@ import net.minecraft.world.World; //well it ain't fucking funny //this stupid fucking random ass bullshit is the P R E C I S E reason i loathe working with entities //honest to fucking god was the entire mojang dev team on crack when they wrote this? +@NotableComments public class EntitySiegeTunneler extends EntityBurrowingSwingingBase { public EntitySiegeTunneler(World world) { diff --git a/src/main/java/com/hbm/interfaces/NotableComments.java b/src/main/java/com/hbm/interfaces/NotableComments.java new file mode 100644 index 000000000..24ced52c9 --- /dev/null +++ b/src/main/java/com/hbm/interfaces/NotableComments.java @@ -0,0 +1,7 @@ +package com.hbm.interfaces; + +/* + * Historically, NTM has had so many comments that are either funny or lengthy rants or other silly shit that it's + * hard to keep track of all of it, this annotation shall be used on classes with noteworthy comments. + */ +public @interface NotableComments { } diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index b63e5d595..02c33f4d6 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -20,6 +20,7 @@ import com.hbm.hazard.HazardData; import com.hbm.hazard.HazardEntry; import com.hbm.hazard.HazardRegistry; import com.hbm.hazard.HazardSystem; +import com.hbm.interfaces.NotableComments; import com.hbm.inventory.RecipesCommon.ComparableStack; import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; @@ -45,6 +46,7 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; //the more i optimize this, the more it starts looking like gregtech +@NotableComments public class OreDictManager { /** Alternate, additional names for ore dict registration. Used mostly for DictGroups */ diff --git a/src/main/java/com/hbm/inventory/SlotNonRetarded.java b/src/main/java/com/hbm/inventory/SlotNonRetarded.java index 02b7faa05..87c166277 100644 --- a/src/main/java/com/hbm/inventory/SlotNonRetarded.java +++ b/src/main/java/com/hbm/inventory/SlotNonRetarded.java @@ -1,5 +1,7 @@ package com.hbm.inventory; +import com.hbm.interfaces.NotableComments; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -8,6 +10,7 @@ import net.minecraft.item.ItemStack; * Because vanilla slots have severe mental disabilities that prevent them from working as expected. * @author hbm */ +@NotableComments public class SlotNonRetarded extends Slot { public SlotNonRetarded(IInventory inventory, int id, int x, int y) { diff --git a/src/main/java/com/hbm/inventory/gui/GUIAutocrafter.java b/src/main/java/com/hbm/inventory/gui/GUIAutocrafter.java index d1d04592d..49ed13445 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIAutocrafter.java +++ b/src/main/java/com/hbm/inventory/gui/GUIAutocrafter.java @@ -4,6 +4,7 @@ import java.util.Arrays; import org.lwjgl.opengl.GL11; +import com.hbm.interfaces.NotableComments; import com.hbm.inventory.container.ContainerAutocrafter; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityMachineAutocrafter; @@ -15,6 +16,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +@NotableComments public class GUIAutocrafter extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_autocrafter.png"); diff --git a/src/main/java/com/hbm/items/block/ItemModSlab.java b/src/main/java/com/hbm/items/block/ItemModSlab.java index a562c28f2..9a6720064 100644 --- a/src/main/java/com/hbm/items/block/ItemModSlab.java +++ b/src/main/java/com/hbm/items/block/ItemModSlab.java @@ -1,11 +1,13 @@ package com.hbm.items.block; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.NotableComments; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.item.ItemSlab; +@NotableComments public class ItemModSlab extends ItemSlab { public ItemModSlab(Block block) { diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java index 681d37d7f..ae69ebfb0 100644 --- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java +++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactory9mm.java @@ -52,7 +52,7 @@ public class XFactory9mm { ).setUnlocalizedName("gun_greasegun").setTextureName(RefStrings.MODID + ":gun_darter"); ModItems.gun_lag = new ItemGunBaseNT(new GunConfig() - .dura(1_700).draw(15).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) + .dura(1_700).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) .dmg(15F).delay(4).dry(40).spread(0.005F).reload(60).jam(55).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) .mag(new MagazineFullReload(0, 17).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) @@ -63,7 +63,7 @@ public class XFactory9mm { ).setUnlocalizedName("gun_lag").setTextureName(RefStrings.MODID + ":gun_darter"); ModItems.gun_uzi = new ItemGunBaseNT(new GunConfig() - .dura(3_000).draw(15).inspect(31).crosshair(Crosshair.L_CIRCLE).smoke(LAMBDA_SMOKE) + .dura(3_000).draw(15).inspect(31).crosshair(Crosshair.CIRCLE).smoke(LAMBDA_SMOKE) .rec(new Receiver(0) .dmg(7.5F).delay(2).dry(25).auto(true).spread(0.005F).reload(55).jam(50).sound("hbm:weapon.fire.blackPowder", 1.0F, 1.0F) .mag(new MagazineFullReload(0, 30).addConfigs(p9_sp, p9_fmj, p9_jhp, p9_ap)) @@ -114,7 +114,7 @@ public class XFactory9mm { return null; }; - public static BiFunction LAMBDA_UZI_ANIMS = (stack, type) -> { + @SuppressWarnings("incomplete-switch") public static BiFunction LAMBDA_UZI_ANIMS = (stack, type) -> { switch(type) { case EQUIP: return new BusAnimation() .addBus("EQUIP", new BusAnimationSequence().addPos(80, 0, 0, 0).addPos(80, 0, 0, 500).addPos(0, 0, 0, 500, IType.SIN_FULL)) diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 0cff4e1a5..934976067 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -294,13 +294,6 @@ public class MainRegistry { if(WorldConfig.enableCraterBiomes) BiomeGenCraterBase.initDictionary(); - /*Library.superuser.add("192af5d7-ed0f-48d8-bd89-9d41af8524f8"); - Library.superuser.add("5aee1e3d-3767-4987-a222-e7ce1fbdf88e"); - Library.superuser.add("937c9804-e11f-4ad2-a5b1-42e62ac73077"); - Library.superuser.add("3af1c262-61c0-4b12-a4cb-424cc3a9c8c0"); - Library.superuser.add("4729b498-a81c-42fd-8acd-20d6d9f759e0"); - Library.superuser.add("c3f5e449-6d8c-4fe3-acc9-47ef50e7e7ae");*/ - aMatSchrab.customCraftingMaterial = ModItems.ingot_schrabidium; aMatHaz.customCraftingMaterial = ModItems.hazmat_cloth; aMatHaz2.customCraftingMaterial = ModItems.hazmat_cloth_red; diff --git a/src/main/java/com/hbm/packet/toclient/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java b/src/main/java/com/hbm/packet/toclient/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java index 142a3fb26..e11d45dc4 100644 --- a/src/main/java/com/hbm/packet/toclient/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java +++ b/src/main/java/com/hbm/packet/toclient/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.List; import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; +import com.hbm.interfaces.NotableComments; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -20,6 +21,7 @@ import net.minecraft.world.ChunkPosition; * @author hbm * */ +@NotableComments public class ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket implements IMessage { private double posX; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java index 771badfe1..ba54dee6f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java @@ -28,12 +28,15 @@ import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.fluid.IFluidStandardTransceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -316,6 +319,31 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i @Override public boolean isItemValidForSlot(int x, int y, int z, int slot, ItemStack stack) { return slot < 3 || slot == 4; } @Override public boolean canExtractItem(int x, int y, int z, int slot, ItemStack stack, int side) { return false; } + + AxisAlignedBB bb = null; + + @Override + public AxisAlignedBB getRenderBoundingBox() { + + if(bb == null) { + bb = AxisAlignedBB.getBoundingBox( + xCoord - 2, + yCoord, + zCoord - 2, + xCoord + 3, + yCoord + 5, + zCoord + 3 + ); + } + + return bb; + } + + @Override + @SideOnly(Side.CLIENT) + public double getMaxRenderDistanceSquared() { + return 65536.0D; + } @Override public int[] getAccessibleSlotsFromSide(int x, int y, int z, int side) { diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java b/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java index 9da1cfa2a..35a26b5a5 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityRequestNetwork.java @@ -3,6 +3,7 @@ package com.hbm.tileentity.network; import java.util.HashMap; import java.util.Iterator; +import com.hbm.interfaces.NotableComments; import com.hbm.tileentity.network.RequestNetwork.PathNode; import com.hbm.util.HashedSet; import com.hbm.util.ParticleUtil; @@ -24,6 +25,7 @@ import net.minecraft.world.World; * @author hbm * */ +@NotableComments public abstract class TileEntityRequestNetwork extends TileEntity { public HashedSet reachableNodes = new HashedSet(); diff --git a/src/main/java/com/hbm/util/StatHelper.java b/src/main/java/com/hbm/util/StatHelper.java index 356d1da0a..fbd7fec34 100644 --- a/src/main/java/com/hbm/util/StatHelper.java +++ b/src/main/java/com/hbm/util/StatHelper.java @@ -3,6 +3,8 @@ package com.hbm.util; import java.util.Iterator; import java.util.Map; +import com.hbm.interfaces.NotableComments; + import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -14,6 +16,7 @@ import net.minecraft.stats.StatCrafting; import net.minecraft.stats.StatList; import net.minecraft.util.ChatComponentTranslation; +@NotableComments public class StatHelper { /* diff --git a/src/main/java/com/hbm/util/TrackerUtil.java b/src/main/java/com/hbm/util/TrackerUtil.java index 5990c8b21..09577505a 100644 --- a/src/main/java/com/hbm/util/TrackerUtil.java +++ b/src/main/java/com/hbm/util/TrackerUtil.java @@ -1,5 +1,7 @@ package com.hbm.util; +import com.hbm.interfaces.NotableComments; + import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityTracker; @@ -15,6 +17,7 @@ import net.minecraft.world.WorldServer; * * @author hbm */ +@NotableComments public class TrackerUtil { /** Grabs the tracker entry from the given entity */ diff --git a/src/main/java/com/hbm/world/generator/JungleDungeon.java b/src/main/java/com/hbm/world/generator/JungleDungeon.java index a0ddadfc8..50fc0dfa9 100644 --- a/src/main/java/com/hbm/world/generator/JungleDungeon.java +++ b/src/main/java/com/hbm/world/generator/JungleDungeon.java @@ -5,11 +5,13 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.NotableComments; import com.hbm.inventory.RecipesCommon.MetaBlock; import com.hbm.world.generator.TimedGenerator.ITimedJob; import net.minecraft.world.World; +@NotableComments public class JungleDungeon extends CellularDungeon { public boolean hasHole = false; @@ -70,6 +72,7 @@ public class JungleDungeon extends CellularDungeon { //since all the building is timed jobs, this has to be as well. timed jobs are ordered so this works! //is it shitty coding? is it not? who knows? + //future bob here: yes it is, go fuck yourself } }