From 8c005a39fb7c2b4c2ef09b22a3599f9889518c9c Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 20 Mar 2022 16:12:18 +0100 Subject: [PATCH] removed machine sound category --- src/main/java/api/hbm/fluid/IFluidConnector.java | 2 +- src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 4 +--- src/main/java/com/hbm/util/SoundUtil.java | 10 ++++++++-- src/main/java/com/hbm/world/dungeon/AncientTomb.java | 2 +- src/main/resources/mcmod.info | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/api/hbm/fluid/IFluidConnector.java b/src/main/java/api/hbm/fluid/IFluidConnector.java index 0b58d46ad..3430cc739 100644 --- a/src/main/java/api/hbm/fluid/IFluidConnector.java +++ b/src/main/java/api/hbm/fluid/IFluidConnector.java @@ -18,7 +18,7 @@ public interface IFluidConnector { * @param dir * @return */ - public default boolean canConnect(ForgeDirection dir) { + public default boolean canConnect(FluidType type, ForgeDirection dir) { return dir != ForgeDirection.UNKNOWN; } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index f434aec9f..5de3b052f 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 (4178)"; + public static final String VERSION = "1.0.27 BETA (4179)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 2c6c75bc5..faa039536 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -19,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; @@ -86,7 +85,6 @@ import com.hbm.tileentity.machine.storage.*; import com.hbm.tileentity.network.*; import com.hbm.tileentity.turret.*; import com.hbm.util.BobMathUtil; -import com.hbm.util.SoundUtil; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -115,7 +113,7 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.addNewArmourRendererPrefix("8"); RenderingRegistry.addNewArmourRendererPrefix("9"); - SoundUtil.addSoundCategory("ntmMachines"); + //SoundUtil.addSoundCategory("ntmMachines"); } private void registerClientEventHandler(Object handler) { diff --git a/src/main/java/com/hbm/util/SoundUtil.java b/src/main/java/com/hbm/util/SoundUtil.java index 773d44d68..56f4403ac 100644 --- a/src/main/java/com/hbm/util/SoundUtil.java +++ b/src/main/java/com/hbm/util/SoundUtil.java @@ -10,9 +10,15 @@ import net.minecraft.client.audio.SoundCategory; import net.minecraft.client.settings.GameSettings; import net.minecraftforge.common.util.EnumHelper; +/** + * This class is dedicated to the retard who thought making sound categories into enums and setting everything useful to private was a good idea. + * Fuck you. + * @author hbm + * + */ public class SoundUtil { - public static void addSoundCategory(String name) { + /*public static void addSoundCategory(String name) { try { SoundCategory category = EnumHelper.addEnum(SoundCategory.class, name.toUpperCase(), new Class[] { String.class, int.class }, new Object[] { name, SoundCategory.values().length }); @@ -40,5 +46,5 @@ public class SoundUtil { } catch(Exception e) { e.printStackTrace(); } - } + }*/ } diff --git a/src/main/java/com/hbm/world/dungeon/AncientTomb.java b/src/main/java/com/hbm/world/dungeon/AncientTomb.java index c319fa4b2..0d85cabec 100644 --- a/src/main/java/com/hbm/world/dungeon/AncientTomb.java +++ b/src/main/java/com/hbm/world/dungeon/AncientTomb.java @@ -86,7 +86,7 @@ public class AncientTomb { int iy = world.getHeightValue(ix, iz) - 3; for(int j = iy; j < iy + 7; j++) { - world.setBlock(ix, j, iz, ModBlocks.deco_steel); + world.setBlock(ix, j, iz, ModBlocks.deco_steel, 0, 2); } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3b8a1cf2a..07980a6b6 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4178", + "version":"1.0.27_X4179", "mcversion": "1.7.10", "url": "", "updateUrl": "",