xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Pheonix 2022-03-20 20:24:02 +00:00
commit fc59b72425
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/api/hbm/fluid/IFluidConnector.java
View File

@ -18,7 +18,7 @@ public interface IFluidConnector {
* @param dir * @param dir
* @return * @return
*/ */
public default boolean canConnect(ForgeDirection dir) { public default boolean canConnect(FluidType type, ForgeDirection dir) {
return dir != ForgeDirection.UNKNOWN; return dir != ForgeDirection.UNKNOWN;
} }

2
src/main/java/com/hbm/lib/RefStrings.java
View File

@ -3,7 +3,7 @@ package com.hbm.lib;
public class RefStrings { public class RefStrings {
public static final String MODID = "hbm"; public static final String MODID = "hbm";
public static final String NAME = "Hbm's Nuclear Tech Mod"; 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: //HBM's Beta Naming Convention:
//V T (X) //V T (X)
//V -> next release version //V -> next release version

4
src/main/java/com/hbm/main/ClientProxy.java
View File

@ -19,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
@ -86,7 +85,6 @@ import com.hbm.tileentity.machine.storage.*;
import com.hbm.tileentity.network.*; import com.hbm.tileentity.network.*;
import com.hbm.tileentity.turret.*; import com.hbm.tileentity.turret.*;
import com.hbm.util.BobMathUtil; import com.hbm.util.BobMathUtil;
import com.hbm.util.SoundUtil;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
@ -115,7 +113,7 @@ public class ClientProxy extends ServerProxy {
RenderingRegistry.addNewArmourRendererPrefix("8"); RenderingRegistry.addNewArmourRendererPrefix("8");
RenderingRegistry.addNewArmourRendererPrefix("9"); RenderingRegistry.addNewArmourRendererPrefix("9");
SoundUtil.addSoundCategory("ntmMachines"); //SoundUtil.addSoundCategory("ntmMachines");
} }
private void registerClientEventHandler(Object handler) { private void registerClientEventHandler(Object handler) {

10
src/main/java/com/hbm/util/SoundUtil.java
View File

@ -10,9 +10,15 @@ import net.minecraft.client.audio.SoundCategory;
import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.GameSettings;
import net.minecraftforge.common.util.EnumHelper; 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 class SoundUtil {
public static void addSoundCategory(String name) { /*public static void addSoundCategory(String name) {
try { try {
SoundCategory category = EnumHelper.addEnum(SoundCategory.class, name.toUpperCase(), new Class[] { String.class, int.class }, new Object[] { name, SoundCategory.values().length }); 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) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }*/
} }

2
src/main/java/com/hbm/world/dungeon/AncientTomb.java
View File

@ -86,7 +86,7 @@ public class AncientTomb {
int iy = world.getHeightValue(ix, iz) - 3; int iy = world.getHeightValue(ix, iz) - 3;
for(int j = iy; j < iy + 7; j++) { 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);
} }
} }

2
src/main/resources/mcmod.info
View File

@ -3,7 +3,7 @@
"modid": "hbm", "modid": "hbm",
"name": "Hbm's Nuclear Tech", "name": "Hbm's Nuclear Tech",
"description": "A mod that adds weapons, nuclear themed stuff and machines", "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", "mcversion": "1.7.10",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",