Skip to content

Commit

Permalink
Fix some server errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Drillgon200
Drillgon200 committed Mar 16, 2020
1 parent 53fc1ca commit 7905bfd
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 75 deletions.
2 changes: 1 addition & 1 deletion com/hbm/core/ChunkRenderContainerClassTransformer.java
View file
Expand Up @@ -16,7 +16,7 @@
import org.objectweb.asm.tree.VarInsnNode;

import com.hbm.main.ModEventHandlerClient;
import com.sun.xml.internal.ws.org.objectweb.asm.Type;
import org.objectweb.asm.Type;

import net.minecraft.launchwrapper.IClassTransformer;

Expand Down
2 changes: 1 addition & 1 deletion com/hbm/core/GlStateManagerClassTransformer.java
View file
Expand Up @@ -11,7 +11,7 @@
import org.objectweb.asm.tree.MethodNode;

import com.hbm.main.ModEventHandlerClient;
import com.sun.xml.internal.ws.org.objectweb.asm.Type;
import org.objectweb.asm.Type;

import net.minecraft.launchwrapper.IClassTransformer;

Expand Down
2 changes: 1 addition & 1 deletion com/hbm/core/ProfilerClassTransformer.java
View file
Expand Up @@ -14,7 +14,7 @@
import org.objectweb.asm.tree.VarInsnNode;

import com.hbm.main.ModEventHandlerClient;
import com.sun.xml.internal.ws.org.objectweb.asm.Type;
import org.objectweb.asm.Type;

import net.minecraft.launchwrapper.IClassTransformer;

Expand Down
2 changes: 1 addition & 1 deletion com/hbm/core/RenderManagerClassTransformer.java
View file
Expand Up @@ -13,7 +13,7 @@
import org.objectweb.asm.tree.VarInsnNode;

import com.hbm.main.ModEventHandlerClient;
import com.sun.xml.internal.ws.org.objectweb.asm.Type;
import org.objectweb.asm.Type;

import net.minecraft.launchwrapper.IClassTransformer;

Expand Down
2 changes: 1 addition & 1 deletion com/hbm/core/TileEntityRendererDispatcherClassTransformer.java
View file
Expand Up @@ -13,7 +13,7 @@
import org.objectweb.asm.tree.VarInsnNode;

import com.hbm.main.ModEventHandlerClient;
import com.sun.xml.internal.ws.org.objectweb.asm.Type;
import org.objectweb.asm.Type;

import net.minecraft.launchwrapper.IClassTransformer;

Expand Down
3 changes: 3 additions & 0 deletions com/hbm/items/special/ItemCell.java
View file
Expand Up @@ -30,6 +30,8 @@
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

public class ItemCell extends ItemRadioactive {

Expand Down Expand Up @@ -119,6 +121,7 @@ public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos
}

@Override
@SideOnly(Side.CLIENT)
public String getItemStackDisplayName(ItemStack stack) {
FluidStack f = FluidUtil.getFluidContained(stack);
if(f == null){
Expand Down
88 changes: 27 additions & 61 deletions com/hbm/items/tool/ItemCassette.java
View file
Expand Up @@ -14,84 +14,65 @@
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

public class ItemCassette extends Item implements IItemColor {

public enum TrackType {

NULL( " ", null, SoundType.SOUND, 0, 0),
HATCH( "Hatch Siren", HBMSoundHandler.alarmHatch, SoundType.LOOP, 3358839, 250),
ATUOPILOT( "Autopilot Disconnected", HBMSoundHandler.alarmAutopilot, SoundType.LOOP, 11908533, 50),
AMS_SIREN( "AMS Siren", HBMSoundHandler.alarmAMSSiren, SoundType.LOOP, 15055698, 50),
BLAST_DOOR( "Blast Door Alarm", HBMSoundHandler.alarmBlastDoor, SoundType.LOOP, 11665408, 50),
APC_LOOP( "APC Siren", HBMSoundHandler.alarmAPCLoop, SoundType.LOOP, 3565216, 50),
KLAXON( "Klaxon", HBMSoundHandler.alarmKlaxon, SoundType.LOOP, 8421504, 50),
KLAXON_A( "Vault Door Alarm", HBMSoundHandler.alarmFoKlaxonA, SoundType.LOOP, 0x8c810b, 50),
KLAXON_B( "Security Alert", HBMSoundHandler.alarmFoKlaxonB, SoundType.LOOP, 0x76818e, 50),
SIREN( "Standard Siren", HBMSoundHandler.alarmRegular, SoundType.LOOP, 6684672, 100),
CLASSIC( "Classic Siren", HBMSoundHandler.alarmClassic, SoundType.LOOP, 0xc0cfe8, 100),
BANK_ALARM( "Bank Alarm", HBMSoundHandler.alarmBank, SoundType.LOOP, 3572962, 100),
BEEP_SIREN( "Beep Siren", HBMSoundHandler.alarmBeep, SoundType.LOOP, 13882323, 100),
CONTAINER_ALARM( "Container Alarm", HBMSoundHandler.alarmContainer, SoundType.LOOP, 14727839, 100),
SWEEP_SIREN( "Sweep Siren", HBMSoundHandler.alarmSweep, SoundType.LOOP, 15592026, 500),
STRIDER_SIREN( "Missile Silo Siren", HBMSoundHandler.alarmStrider, SoundType.LOOP, 11250586, 500),
AIR_RAID( "Air Raid Siren", HBMSoundHandler.alarmAirRaid, SoundType.LOOP, 0xDF3795, 500),
NOSTROMO_SIREN( "Nostromo Self Destruct", HBMSoundHandler.alarmNostromo, SoundType.LOOP, 0x5dd800, 100),
EAS_ALARM( "EAS Alarm Screech", HBMSoundHandler.alarmEas, SoundType.LOOP, 0xb3a8c1, 50),
APC_PASS( "APC Pass", HBMSoundHandler.alarmAPCPass, SoundType.PASS, 3422163, 50),
RAZORTRAIN( "Razortrain Horn", HBMSoundHandler.alarmRazorTrain, SoundType.SOUND, 7819501, 250);

//Name of the track shown in GUI
public class ItemCassette extends Item {

public enum TrackType {

NULL(" ", null, SoundType.SOUND, 0, 0), HATCH("Hatch Siren", HBMSoundHandler.alarmHatch, SoundType.LOOP, 3358839, 250), ATUOPILOT("Autopilot Disconnected", HBMSoundHandler.alarmAutopilot, SoundType.LOOP, 11908533, 50), AMS_SIREN("AMS Siren", HBMSoundHandler.alarmAMSSiren, SoundType.LOOP, 15055698, 50), BLAST_DOOR("Blast Door Alarm", HBMSoundHandler.alarmBlastDoor, SoundType.LOOP, 11665408, 50), APC_LOOP("APC Siren", HBMSoundHandler.alarmAPCLoop, SoundType.LOOP, 3565216, 50), KLAXON("Klaxon", HBMSoundHandler.alarmKlaxon, SoundType.LOOP, 8421504, 50), KLAXON_A("Vault Door Alarm", HBMSoundHandler.alarmFoKlaxonA, SoundType.LOOP, 0x8c810b, 50), KLAXON_B("Security Alert", HBMSoundHandler.alarmFoKlaxonB, SoundType.LOOP, 0x76818e, 50), SIREN("Standard Siren", HBMSoundHandler.alarmRegular, SoundType.LOOP, 6684672, 100), CLASSIC("Classic Siren", HBMSoundHandler.alarmClassic, SoundType.LOOP, 0xc0cfe8, 100), BANK_ALARM("Bank Alarm", HBMSoundHandler.alarmBank, SoundType.LOOP, 3572962,
100), BEEP_SIREN("Beep Siren", HBMSoundHandler.alarmBeep, SoundType.LOOP, 13882323, 100), CONTAINER_ALARM("Container Alarm", HBMSoundHandler.alarmContainer, SoundType.LOOP, 14727839, 100), SWEEP_SIREN("Sweep Siren", HBMSoundHandler.alarmSweep, SoundType.LOOP, 15592026, 500), STRIDER_SIREN("Missile Silo Siren", HBMSoundHandler.alarmStrider, SoundType.LOOP, 11250586, 500), AIR_RAID("Air Raid Siren", HBMSoundHandler.alarmAirRaid, SoundType.LOOP, 0xDF3795, 500), NOSTROMO_SIREN("Nostromo Self Destruct", HBMSoundHandler.alarmNostromo, SoundType.LOOP, 0x5dd800, 100), EAS_ALARM("EAS Alarm Screech", HBMSoundHandler.alarmEas, SoundType.LOOP, 0xb3a8c1, 50), APC_PASS("APC Pass", HBMSoundHandler.alarmAPCPass, SoundType.PASS, 3422163, 50), RAZORTRAIN("Razortrain Horn", HBMSoundHandler.alarmRazorTrain, SoundType.SOUND, 7819501, 250);

// Name of the track shown in GUI
private String title;
//Location of the sound
// Location of the sound
private SoundEvent location;
//Sound type, whether the sound should be repeated or not
// Sound type, whether the sound should be repeated or not
private SoundType type;
//Color of the cassette
// Color of the cassette
private int color;
//Range where the sound can be heard
// Range where the sound can be heard
private int volume;

private TrackType(String name, SoundEvent loc, SoundType sound, int msa, int intensity) {
title = name;
location = loc;
type = sound;
color = msa;
volume = intensity;
}

public String getTrackTitle() {
return title;
}

public SoundEvent getSoundLocation() {
return location;
}

public SoundType getType() {
return type;
}

public int getColor() {
return color;
}

public int getVolume() {
return volume;
}

public static TrackType getEnum(int i) {
if(i < TrackType.values().length)
return TrackType.values()[i];
else
return TrackType.NULL;
}
};

public enum SoundType {
LOOP,
PASS,
SOUND;
LOOP, PASS, SOUND;
};

public ItemCassette(String s) {
Expand All @@ -111,41 +92,26 @@ public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
}
}
}

@Override
public void addInformation(ItemStack stack, World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
if(!(stack.getItem() instanceof ItemCassette))
return;
return;

tooltip.add("[CREATED USING TEMPLATE FOLDER]");
tooltip.add("");

tooltip.add("Siren sound cassette:");
tooltip.add(" Name: " + TrackType.getEnum(stack.getItemDamage()).getTrackTitle());
tooltip.add(" Type: " + TrackType.getEnum(stack.getItemDamage()).getType().name());
tooltip.add(" Volume: " + TrackType.getEnum(stack.getItemDamage()).getVolume());
}

public static TrackType getType(ItemStack stack) {
if(stack != null && stack.getItem() instanceof ItemCassette)
return TrackType.getEnum(stack.getItemDamage());
else
return TrackType.NULL;
}

@Override
public int colorMultiplier(ItemStack stack, int tintIndex) {
if(tintIndex == 1) {
int j = TrackType.getEnum(stack.getItemDamage()).getColor();

if (j < 0)
{
j = 0xFFFFFF;
}

return j;
}
return 0xFFFFFF;
}

}
3 changes: 3 additions & 0 deletions com/hbm/items/weapon/GunLeverActionS.java
View file
Expand Up @@ -32,6 +32,8 @@
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.ArrowNockEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;

public class GunLeverActionS extends Item {

Expand Down Expand Up @@ -139,6 +141,7 @@ public int getItemEnchantability(ItemStack stack) {
}

@Override
@SideOnly(Side.CLIENT)
public String getItemStackDisplayName(ItemStack stack) {
if(MainRegistry.polaroidID == 11)
return ("" + I18n.format(this.getUnlocalizedName() + "_2.name")).trim();
Expand Down
19 changes: 11 additions & 8 deletions com/hbm/main/MainRegistry.java
View file
Expand Up @@ -260,6 +260,7 @@
import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.SidedProxy;
Expand All @@ -270,6 +271,7 @@
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.registry.EntityRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.oredict.OreDictionary;

@Mod(modid = RefStrings.MODID, version = RefStrings.VERSION, name = RefStrings.NAME)
Expand Down Expand Up @@ -704,7 +706,7 @@ public void preInit(FMLPreInitializationEvent event) {
EntityRegistry.registerModEntity(new ResourceLocation(RefStrings.MODID, "entity_gas_fx"), EntityGasFX.class, "entity_gas_fx", i++, MainRegistry.instance, 1000, 1, true);
EntityRegistry.registerModEntity(new ResourceLocation(RefStrings.MODID, "entity_oil_spill"), EntityOilSpill.class, "entity_oil_spill", i++, MainRegistry.instance, 1000, 1, true);
EntityRegistry.registerModEntity(new ResourceLocation(RefStrings.MODID, "entity_oil_spill_fx"), EntityOilSpillFX.class, "entity_oil_spill_fx", i++, MainRegistry.instance, 1000, 1, true);

ForgeChunkManager.setForcedChunkLoadingCallback(this, new LoadingCallback() {

@Override
Expand Down Expand Up @@ -750,13 +752,14 @@ public static void loadConfig(FMLPreInitializationEvent event) {
shaders.setComment("Experimental, don't use");
useShaders = shaders.getBoolean(false);

if(!OpenGlHelper.shadersSupported) {
logger.log(Level.WARN, "GLSL shaders are not supported; not using shaders");
useShaders = false;
} else if(!GLContext.getCapabilities().OpenGL30) {
logger.log(Level.WARN, "OpenGL 3.0 is not supported; not using shaders");
useShaders = false;
}
if(FMLCommonHandler.instance().getSide() == Side.CLIENT)
if(!OpenGlHelper.shadersSupported) {
logger.log(Level.WARN, "GLSL shaders are not supported; not using shaders");
useShaders = false;
} else if(!GLContext.getCapabilities().OpenGL30) {
logger.log(Level.WARN, "OpenGL 3.0 is not supported; not using shaders");
useShaders = false;
}

final String CATEGORY_OREGEN = "02_ores";
Property PuraniumSpawn = config.get(CATEGORY_OREGEN, "2.00_uraniumSpawnrate", 6);
Expand Down
15 changes: 14 additions & 1 deletion com/hbm/main/ModEventHandlerClient.java
View file
Expand Up @@ -29,6 +29,7 @@
import com.hbm.items.gear.RedstoneSword;
import com.hbm.items.special.weapon.GunB92;
import com.hbm.items.tool.ItemAssemblyTemplate;
import com.hbm.items.tool.ItemCassette;
import com.hbm.items.tool.ItemCassette.TrackType;
import com.hbm.items.tool.ItemChemistryTemplate;
import com.hbm.items.tool.ItemChemistryTemplate.EnumChemistryTemplate;
Expand Down Expand Up @@ -85,6 +86,7 @@
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityEndGateway;
import net.minecraft.tileentity.TileEntityEndPortal;
Expand Down Expand Up @@ -327,7 +329,18 @@ public void swapModelsNoGui(Item item, IRegistry<ModelResourceLocation, IBakedMo

@SubscribeEvent
public void itemColorsEvent(ColorHandlerEvent.Item evt){
evt.getItemColors().registerItemColorHandler((IItemColor)ModItems.siren_track, ModItems.siren_track);
evt.getItemColors().registerItemColorHandler((ItemStack stack, int tintIndex) -> {
if(tintIndex == 1) {
int j = TrackType.getEnum(stack.getItemDamage()).getColor();

if(j < 0) {
j = 0xFFFFFF;
}

return j;
}
return 0xFFFFFF;
}, ModItems.siren_track);
}

@SubscribeEvent
Expand Down

0 comments on commit 7905bfd

Please sign in to comment.