diff --git a/src/main/java/api/hbm/energy/IRadarDetectable.java b/src/main/java/api/hbm/energy/IRadarDetectable.java new file mode 100644 index 000000000..e0449d664 --- /dev/null +++ b/src/main/java/api/hbm/energy/IRadarDetectable.java @@ -0,0 +1,20 @@ +package api.hbm.energy; + +public interface IRadarDetectable { + + public static enum RadarTargetType { + MISSILE_TIER0, //tier 0 missile (micro missile assemblies) + MISSILE_TIER1, //tier 1 missiles + MISSILE_TIER2, //tier 2 missiles + MISSILE_TIER3, //tier 3 missiles + MISSILE_TIER4, //tier 4 missiles (nuclear, thermo, doomsday) + MISSILE_10, //size 10 custom missiles + MISSILE_10_15, //size 10/15 custom missiles + MISSILE_15, //size 15 custom missiles + MISSILE_15_20, //size 15/20 custom missiles + MISSILE_20, //size 20 custom missiles + PLAYER, //airborne players + } + + //TODO: rewrite the crappy radaar TE code and implement the API +} diff --git a/src/main/java/assets/hbm/textures/blocks/muffler.png b/src/main/java/assets/hbm/textures/blocks/muffler.png index be3ccc853..57e0f1c03 100644 Binary files a/src/main/java/assets/hbm/textures/blocks/muffler.png and b/src/main/java/assets/hbm/textures/blocks/muffler.png differ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index a586158e3..4bca1cb22 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -312,6 +312,8 @@ public class ModBlocks { public static Block marker_structure; + public static Block muffler; + public static Block sat_mapper; public static Block sat_scanner; public static Block sat_radar; @@ -1238,6 +1240,8 @@ public class ModBlocks { tesla = new MachineTesla(Material.iron).setBlockName("tesla").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":tesla"); marker_structure = new BlockMarker(Material.iron).setBlockName("marker_structure").setHardness(0.0F).setResistance(0.0F).setLightLevel(1.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":marker_structure"); + + muffler = new BlockGeneric(Material.cloth).setBlockName("muffler").setHardness(0.8F).setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":muffler"); launch_pad = new LaunchPad(Material.iron).setBlockName("launch_pad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":launch_pad"); machine_radar = new MachineRadar(Material.iron).setBlockName("machine_radar").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_radar"); @@ -1856,6 +1860,9 @@ public class ModBlocks { //Multiblock Helpers GameRegistry.registerBlock(marker_structure, marker_structure.getUnlocalizedName()); + //The muffler + GameRegistry.registerBlock(muffler, muffler.getUnlocalizedName()); + //Multiblock Parts GameRegistry.registerBlock(struct_launcher, struct_launcher.getUnlocalizedName()); GameRegistry.registerBlock(struct_scaffold, struct_scaffold.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 403206b47..af3b70ce3 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -40,6 +40,8 @@ import com.hbm.render.entity.mob.*; import com.hbm.render.entity.projectile.*; import com.hbm.render.entity.rocket.*; import com.hbm.render.item.*; +import com.hbm.render.item.block.*; +import com.hbm.render.item.weapon.*; import com.hbm.render.loader.HmfModelLoader; import com.hbm.render.tileentity.*; import com.hbm.render.util.MissilePart; @@ -53,43 +55,29 @@ import com.hbm.tileentity.machine.*; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -public class ClientProxy extends ServerProxy -{ +public class ClientProxy extends ServerProxy { + @Override - public void registerRenderInfo() - { - MinecraftForge.EVENT_BUS.register(new ModEventHandlerClient()); - - AdvancedModelLoader.registerModelHandler(new HmfModelLoader()); - - RenderingRegistry.registerBlockHandler(new RenderTaintBlock()); - RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); - RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); - RenderingRegistry.registerBlockHandler(new RenderSteelBeam()); - RenderingRegistry.registerBlockHandler(new RenderBarrel()); - RenderingRegistry.registerBlockHandler(new RenderFence()); - RenderingRegistry.registerBlockHandler(new RenderBarbedWire()); - RenderingRegistry.registerBlockHandler(new RenderAntennaTop()); - RenderingRegistry.registerBlockHandler(new RenderConserve()); - RenderingRegistry.registerBlockHandler(new RenderConveyor()); - - MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate()); - MinecraftForgeClient.registerItemRenderer(ModItems.chemistry_template, new ItemRenderTemplate()); - + public void registerTileEntitySpecialRenderer() { + //test crap ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTestRender.class, new RenderTestRender()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTestContainer.class, new RenderTestContainer()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_container), new ItemRenderTestContainer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTestBombAdvanced.class, new RenderTestBombAdvanced()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_bomb_advanced), new ItemRenderTestBombAdvanced()); - - MinecraftForgeClient.registerItemRenderer(ModItems.redstone_sword, new ItemRenderRedstoneSword()); - MinecraftForgeClient.registerItemRenderer(ModItems.big_sword, new ItemRenderBigSword()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRotationTester.class, new RenderRotationTester()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityObjTester.class, new RendererObjTester()); - + //deco + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleSatelliteReceiver.class, new RenderPoleSatelliteReceiver()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlock.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBroadcaster.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGeiger.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRadioRec.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRadiobox.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBomber.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineSatDock.class, new RenderDecoBlock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAlt.class, new RenderDecoBlockAlt()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltG.class, new RenderDecoBlockAlt()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltW.class, new RenderDecoBlockAlt()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltF.class, new RenderDecoBlockAlt()); + //bombs ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeGadget.class, new RenderNukeGadget()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeBoy.class, new RenderNukeBoy()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeCustom.class, new RenderNukeCustom()); @@ -98,7 +86,13 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeMan.class, new RenderNukeMan()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeN45.class, new RenderNukeN45()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeBalefire.class, new RenderNukeFstbmb()); - + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeMike.class, new RenderNukeMike()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeTsar.class, new RenderNukeTsar()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeFleija.class, new RenderNukeFleija()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCrashedBomb.class, new RenderCrashedBomb()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukePrototype.class, new RenderNukePrototype()); + //turrets ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretHeavy.class, new RenderHeavyTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretRocket.class, new RenderRocketTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretLight.class, new RenderLightTurret()); @@ -107,19 +101,15 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretSpitfire.class, new RenderSpitfireTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretCIWS.class, new RenderCIWSTurret()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTurretCheapo.class, new RenderCheapoTurret()); - + //mines ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLandmine.class, new RenderLandmine()); - + //cel prime ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCelPrime.class, new RenderCelPrimeTower()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCelPrimeTerminal.class, new RenderCelPrimePart()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCelPrimeBattery.class, new RenderCelPrimePart()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCelPrimePort.class, new RenderCelPrimePart()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCelPrimeTanks.class, new RenderCelPrimePart()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFF.class, new RenderForceField()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForceField.class, new RenderMachineForceField()); - + //machines ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineCentrifuge.class, new RenderCentrifuge()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineGasCent.class, new RenderCentrifuge()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineUF6Tank.class, new RenderUF6Tank()); @@ -148,107 +138,64 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineCrystallizer.class, new RenderCrystallizer()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMicrowave.class, new RenderMicrowave()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRTG.class, new RenderRTG()); - + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFF.class, new RenderForceField()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityForceField.class, new RenderMachineForceField()); + //AMS + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSBase.class, new RenderAMSBase()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSEmitter.class, new RenderAMSEmitter()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSLimiter.class, new RenderAMSLimiter()); + //DFC + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreEmitter.class, new RenderCoreComponent()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreReceiver.class, new RenderCoreComponent()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreInjector.class, new RenderCoreComponent()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreStabilizer.class, new RenderCoreComponent()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCore.class, new RenderCore()); + //missile blocks + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaunchPad.class, new RenderLaunchPadTier1()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMissileAssembly.class, new RenderMissileAssembly()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompactLauncher.class, new RenderCompactLauncher()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaunchTable.class, new RenderLaunchTable()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzLauncher.class, new RenderSoyuzLauncher()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzCapsule.class, new RenderCapsule()); + //network + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCable.class, new RenderCable()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityOilDuct.class, new RenderOilDuct()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGasDuct.class, new RenderGasDuct()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFluidDuct.class, new RenderFluidDuct()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRFDuct.class, new RenderRFCable()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPylonRedWire.class, new RenderPylon()); + //multiblocks + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityStructureMarker.class, new RenderStructureMaker()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMultiblock.class, new RenderMultiblock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzStruct.class, new RenderSoyuzMultiblock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITERStruct.class, new RenderITERMultiblock()); + //doors ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVaultDoor.class, new RenderVaultDoor()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBlastDoor.class, new RenderBlastDoor()); + } - RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core)); - + @Override + public void registerItemRenderer() { + //test crap + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_container), new ItemRenderTestContainer()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.test_bomb_advanced), new ItemRenderTestBombAdvanced()); + //templates + MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate()); + MinecraftForgeClient.registerItemRenderer(ModItems.chemistry_template, new ItemRenderTemplate()); + //swords and hammers + MinecraftForgeClient.registerItemRenderer(ModItems.redstone_sword, new ItemRenderRedstoneSword()); + MinecraftForgeClient.registerItemRenderer(ModItems.big_sword, new ItemRenderBigSword()); + MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_sledge, new ItemRenderShim()); + MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim()); + MinecraftForgeClient.registerItemRenderer(ModItems.stopsign, new ItemRenderShim()); + MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim()); + MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim()); + //guns MinecraftForgeClient.registerItemRenderer(ModItems.gun_rpg, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_karl, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_panzerschreck, new ItemRenderRpg()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_stinger, new ItemRenderStinger()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_skystinger, new ItemRenderStinger()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_deagle, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_supershotgun, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_ks23, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_flamer, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_flechette, new ItemRenderWeaponObj()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_quadro, new ItemRenderWeaponQuadro()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_sauer, new ItemRenderWeaponSauer()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBombMulti.class, new RenderBombMulti()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeMike.class, new RenderNukeMike()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeTsar.class, new RenderNukeTsar()); - - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGeneric.class, new RenderSnowball(ModItems.grenade_generic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeStrong.class, new RenderSnowball(ModItems.grenade_strong)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFrag.class, new RenderSnowball(ModItems.grenade_frag)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFire.class, new RenderSnowball(ModItems.grenade_fire)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCluster.class, new RenderSnowball(ModItems.grenade_cluster)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFlare.class, new RenderFlare()); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeElectric.class, new RenderSnowball(ModItems.grenade_electric)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePoison.class, new RenderSnowball(ModItems.grenade_poison)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGas.class, new RenderSnowball(ModItems.grenade_gas)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSchrabidium.class, new RenderSnowball(ModItems.grenade_schrabidium)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuke.class, new RenderSnowball(ModItems.grenade_nuke)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuclear.class, new RenderSnowball(ModItems.grenade_nuclear)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePlasma.class, new RenderSnowball(ModItems.grenade_plasma)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeTau.class, new RenderSnowball(ModItems.grenade_tau)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeLemon.class, new RenderSnowball(ModItems.grenade_lemon)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMk2.class, new RenderGrenade()); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeZOMG.class, new RenderSnowball(ModItems.grenade_zomg)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeASchrab.class, new RenderSnowball(ModItems.grenade_aschrab)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePulse.class, new RenderSnowball(ModItems.grenade_pulse)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeShrapnel.class, new RenderSnowball(ModItems.grenade_shrapnel)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBlackHole.class, new RenderSnowball(ModItems.grenade_black_hole)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGascan.class, new RenderSnowball(ModItems.grenade_gascan)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCloud.class, new RenderSnowball(ModItems.grenade_cloud)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePC.class, new RenderSnowball(ModItems.grenade_pink_cloud)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSmart.class, new RenderSnowball(ModItems.grenade_smart)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMIRV.class, new RenderSnowball(ModItems.grenade_mirv)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBreach.class, new RenderSnowball(ModItems.grenade_breach)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBurst.class, new RenderSnowball(ModItems.grenade_burst)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFGeneric.class, new RenderSnowball(ModItems.grenade_if_generic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHE.class, new RenderSnowball(ModItems.grenade_if_he)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBouncy.class, new RenderSnowball(ModItems.grenade_if_bouncy)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSticky.class, new RenderSnowball(ModItems.grenade_if_sticky)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFImpact.class, new RenderSnowball(ModItems.grenade_if_impact)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFIncendiary.class, new RenderSnowball(ModItems.grenade_if_incendiary)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFToxic.class, new RenderSnowball(ModItems.grenade_if_toxic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFConcussion.class, new RenderSnowball(ModItems.grenade_if_concussion)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBrimstone.class, new RenderSnowball(ModItems.grenade_if_brimstone)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFMystery.class, new RenderSnowball(ModItems.grenade_if_mystery)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSpark.class, new RenderSnowball(ModItems.grenade_if_spark)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHopwire.class, new RenderSnowball(ModItems.grenade_if_hopwire)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFNull.class, new RenderSnowball(ModItems.grenade_if_null)); - - RenderingRegistry.registerEntityRenderingHandler(EntitySchrab.class, new RenderFlare()); - - RenderingRegistry.registerEntityRenderingHandler(EntityTestMissile.class, new RenderTestMissile()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeFleija.class, new RenderNukeFleija()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCrashedBomb.class, new RenderCrashedBomb()); - - RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudSmall.class, new RenderSmallNukeMK3()); - RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudBig.class, new RenderBigNuke()); - RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleija.class, new RenderCloudFleija()); - RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleijaRainbow.class, new RenderCloudRainbow()); - RenderingRegistry.registerEntityRenderingHandler(EntityCloudSolinium.class, new RenderCloudSolinium()); - RenderingRegistry.registerEntityRenderingHandler(EntityCloudTom.class, new RenderCloudTom()); - RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud()); - RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout()); - RenderingRegistry.registerEntityRenderingHandler(EntityBlackHole.class, new RenderBlackHole()); - RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderBlackHole()); - RenderingRegistry.registerEntityRenderingHandler(EntityRagingVortex.class, new RenderBlackHole()); - RenderingRegistry.registerEntityRenderingHandler(EntityDeathBlast.class, new RenderDeathBlast()); - - //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder()); - //ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleTop.class, new RenderPoleTop()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoPoleSatelliteReceiver.class, new RenderPoleSatelliteReceiver()); - - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tape_recorder), new ItemRenderTapeRecorder()); - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_poles), new ItemRenderSteelPoles()); - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_top), new ItemRenderPoleTop()); - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.pole_satellite_receiver), new ItemRenderSatelliteReceiver()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTaint.class, new RenderTaint()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver, new ItemRenderRevolver()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_saturnite, new ItemRenderRevolver()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_iron, new ItemRenderRevolverIron()); @@ -303,7 +250,20 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_avenger, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_lacunae, new ItemRenderOverkill()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_folly, new ItemRenderOverkill()); - + MinecraftForgeClient.registerItemRenderer(ModItems.gun_brimstone, new ItemRenderObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_deagle, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_supershotgun, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_ks23, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_flamer, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_flechette, new ItemRenderWeaponObj()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_quadro, new ItemRenderWeaponQuadro()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_sauer, new ItemRenderWeaponSauer()); + //ammo + MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman_ammo, new ItemRenderMiniNuke()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_mirv_ammo, new ItemRenderMIRV()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_bf_ammo, new ItemRenderBaleflare()); + //multitool MinecraftForgeClient.registerItemRenderer(ModItems.multitool_dig, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_silk, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_ext, new ItemRenderMultitool()); @@ -314,23 +274,22 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.multitool_mega, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_joule, new ItemRenderMultitool()); MinecraftForgeClient.registerItemRenderer(ModItems.multitool_decon, new ItemRenderMultitool()); + //blocks + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_wall), new ItemRenderDecoBlock()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_corner), new ItemRenderDecoBlock()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_roof), new ItemRenderDecoBlock()); + } - MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_sledge, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.shimmer_axe, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.stopsign, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.sopsign, new ItemRenderShim()); - MinecraftForgeClient.registerItemRenderer(ModItems.pch, new ItemRenderShim()); - - MinecraftForgeClient.registerItemRenderer(ModItems.gun_brimstone, new ItemRenderObj()); - + @Override + public void registerEntityRenderer() { + //projectiles + RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core)); + RenderingRegistry.registerEntityRenderingHandler(EntitySchrab.class, new RenderFlare()); RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityBulletBase.class, new RenderBullet()); RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke()); RenderingRegistry.registerEntityRenderingHandler(EntityMiniMIRV.class, new RenderMiniMIRV()); RenderingRegistry.registerEntityRenderingHandler(EntityBaleflare.class, new RenderBaleflare()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman_ammo, new ItemRenderMiniNuke()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_mirv_ammo, new ItemRenderMIRV()); - MinecraftForgeClient.registerItemRenderer(ModItems.gun_bf_ammo, new ItemRenderBaleflare()); RenderingRegistry.registerEntityRenderingHandler(EntityRainbow.class, new RenderRainbow()); RenderingRegistry.registerEntityRenderingHandler(EntityNightmareBlast.class, new RenderOminousBullet()); RenderingRegistry.registerEntityRenderingHandler(EntityFire.class, new RenderFireball(ModItems.energy_ball)); @@ -342,67 +301,6 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityModBeam.class, new RenderBeam6()); RenderingRegistry.registerEntityRenderingHandler(EntityLN2.class, new RenderLN2(ModItems.energy_ball)); RenderingRegistry.registerEntityRenderingHandler(EntityLaser.class, new RenderLaser()); - - RenderingRegistry.registerEntityRenderingHandler(EntityNukeExplosionAdvanced.class, new RenderSnowball(ModItems.energy_ball)); - - RenderingRegistry.registerEntityRenderingHandler(EntityMinecartTest.class, new RenderMinecartTest()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMovingItem.class, new RenderMovingItem()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukePrototype.class, new RenderNukePrototype()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaunchPad.class, new RenderLaunchPadTier1()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMissileAssembly.class, new RenderMissileAssembly()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompactLauncher.class, new RenderCompactLauncher()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaunchTable.class, new RenderLaunchTable()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzLauncher.class, new RenderSoyuzLauncher()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzCapsule.class, new RenderCapsule()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCable.class, new RenderCable()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityOilDuct.class, new RenderOilDuct()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGasDuct.class, new RenderGasDuct()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFluidDuct.class, new RenderFluidDuct()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRFDuct.class, new RenderRFCable()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPylonRedWire.class, new RenderPylon()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityStructureMarker.class, new RenderStructureMaker()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMultiblock.class, new RenderMultiblock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySoyuzStruct.class, new RenderSoyuzMultiblock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITERStruct.class, new RenderITERMultiblock()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSBase.class, new RenderAMSBase()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSEmitter.class, new RenderAMSEmitter()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSLimiter.class, new RenderAMSLimiter()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreEmitter.class, new RenderCoreComponent()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreReceiver.class, new RenderCoreComponent()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreInjector.class, new RenderCoreComponent()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoreStabilizer.class, new RenderCoreComponent()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCore.class, new RenderCore()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMissileCustom.class, new RenderMissileCustom()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMissileGeneric.class, new RenderMissileGeneric()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileAntiBallistic.class, new RenderMissileGeneric()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileIncendiary.class, new RenderMissileGeneric()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileCluster.class, new RenderMissileGeneric()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileBunkerBuster.class, new RenderMissileGeneric()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMissileStrong.class, new RenderMissileStrong()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileIncendiaryStrong.class, new RenderMissileStrong()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileClusterStrong.class, new RenderMissileStrong()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileBusterStrong.class, new RenderMissileStrong()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileEMPStrong.class, new RenderMissileStrong()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMissileBurst.class, new RenderMissileHuge()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileInferno.class, new RenderMissileHuge()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileRain.class, new RenderMissileHuge()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileDrill.class, new RenderMissileHuge()); - - RenderingRegistry.registerEntityRenderingHandler(EntityMissileNuclear.class, new RenderMissileNuclear()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileMirv.class, new RenderMissileMirv()); - RenderingRegistry.registerEntityRenderingHandler(EntityMIRV.class, new RenderMirv()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileDoomsday.class, new RenderMissileDoomsday()); RenderingRegistry.registerEntityRenderingHandler(EntityBombletTheta.class, new RenderBombletTheta()); RenderingRegistry.registerEntityRenderingHandler(EntityBombletZeta.class, new RenderBombletTheta()); RenderingRegistry.registerEntityRenderingHandler(EntityBombletSelena.class, new RenderBombletSelena()); @@ -410,47 +308,113 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityBoxcar.class, new RenderBoxcar()); RenderingRegistry.registerEntityRenderingHandler(EntityDuchessGambit.class, new RenderBoxcar()); RenderingRegistry.registerEntityRenderingHandler(EntityBuilding.class, new RenderBoxcar()); - RenderingRegistry.registerEntityRenderingHandler(EntityCarrier.class, new RenderCarrierMissile()); - RenderingRegistry.registerEntityRenderingHandler(EntityBooster.class, new RenderBoosterMissile()); - RenderingRegistry.registerEntityRenderingHandler(EntitySoyuz.class, new RenderSoyuz()); - RenderingRegistry.registerEntityRenderingHandler(EntitySoyuzCapsule.class, new RenderSoyuzCapsule()); RenderingRegistry.registerEntityRenderingHandler(EntityBomber.class, new RenderBomber()); RenderingRegistry.registerEntityRenderingHandler(EntityBurningFOEQ.class, new RenderFOEQ()); RenderingRegistry.registerEntityRenderingHandler(EntityFallingNuke.class, new RenderFallingNuke()); RenderingRegistry.registerEntityRenderingHandler(EntityMinerRocket.class, new RenderMinerRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityBobmazon.class, new RenderMinerRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityTom.class, new RenderTom()); - + RenderingRegistry.registerEntityRenderingHandler(EntityAAShell.class, new RenderMirv()); + RenderingRegistry.registerEntityRenderingHandler(EntityRocketHoming.class, new RenderSRocket()); + RenderingRegistry.registerEntityRenderingHandler(EntityChopperMine.class, new RenderChopperMine()); + RenderingRegistry.registerEntityRenderingHandler(EntityRubble.class, new RenderRubble()); + RenderingRegistry.registerEntityRenderingHandler(EntityShrapnel.class, new RenderShrapnel()); + RenderingRegistry.registerEntityRenderingHandler(EntityOilSpill.class, new RenderEmpty()); + RenderingRegistry.registerEntityRenderingHandler(EntityWaterSplash.class, new RenderEmpty()); + RenderingRegistry.registerEntityRenderingHandler(EntityEMP.class, new RenderEmpty()); + //grenades + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGeneric.class, new RenderSnowball(ModItems.grenade_generic)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeStrong.class, new RenderSnowball(ModItems.grenade_strong)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFrag.class, new RenderSnowball(ModItems.grenade_frag)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFire.class, new RenderSnowball(ModItems.grenade_fire)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCluster.class, new RenderSnowball(ModItems.grenade_cluster)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFlare.class, new RenderFlare()); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeElectric.class, new RenderSnowball(ModItems.grenade_electric)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePoison.class, new RenderSnowball(ModItems.grenade_poison)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGas.class, new RenderSnowball(ModItems.grenade_gas)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSchrabidium.class, new RenderSnowball(ModItems.grenade_schrabidium)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuke.class, new RenderSnowball(ModItems.grenade_nuke)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuclear.class, new RenderSnowball(ModItems.grenade_nuclear)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePlasma.class, new RenderSnowball(ModItems.grenade_plasma)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeTau.class, new RenderSnowball(ModItems.grenade_tau)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeLemon.class, new RenderSnowball(ModItems.grenade_lemon)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMk2.class, new RenderGrenade()); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeZOMG.class, new RenderSnowball(ModItems.grenade_zomg)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeASchrab.class, new RenderSnowball(ModItems.grenade_aschrab)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePulse.class, new RenderSnowball(ModItems.grenade_pulse)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeShrapnel.class, new RenderSnowball(ModItems.grenade_shrapnel)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBlackHole.class, new RenderSnowball(ModItems.grenade_black_hole)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGascan.class, new RenderSnowball(ModItems.grenade_gascan)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCloud.class, new RenderSnowball(ModItems.grenade_cloud)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePC.class, new RenderSnowball(ModItems.grenade_pink_cloud)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSmart.class, new RenderSnowball(ModItems.grenade_smart)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMIRV.class, new RenderSnowball(ModItems.grenade_mirv)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBreach.class, new RenderSnowball(ModItems.grenade_breach)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBurst.class, new RenderSnowball(ModItems.grenade_burst)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFGeneric.class, new RenderSnowball(ModItems.grenade_if_generic)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHE.class, new RenderSnowball(ModItems.grenade_if_he)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBouncy.class, new RenderSnowball(ModItems.grenade_if_bouncy)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSticky.class, new RenderSnowball(ModItems.grenade_if_sticky)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFImpact.class, new RenderSnowball(ModItems.grenade_if_impact)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFIncendiary.class, new RenderSnowball(ModItems.grenade_if_incendiary)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFToxic.class, new RenderSnowball(ModItems.grenade_if_toxic)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFConcussion.class, new RenderSnowball(ModItems.grenade_if_concussion)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBrimstone.class, new RenderSnowball(ModItems.grenade_if_brimstone)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFMystery.class, new RenderSnowball(ModItems.grenade_if_mystery)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSpark.class, new RenderSnowball(ModItems.grenade_if_spark)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHopwire.class, new RenderSnowball(ModItems.grenade_if_hopwire)); + RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFNull.class, new RenderSnowball(ModItems.grenade_if_null)); + //missiles + RenderingRegistry.registerEntityRenderingHandler(EntityTestMissile.class, new RenderTestMissile()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileCustom.class, new RenderMissileCustom()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileGeneric.class, new RenderMissileGeneric()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileAntiBallistic.class, new RenderMissileGeneric()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileIncendiary.class, new RenderMissileGeneric()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileCluster.class, new RenderMissileGeneric()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileBunkerBuster.class, new RenderMissileGeneric()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileStrong.class, new RenderMissileStrong()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileIncendiaryStrong.class, new RenderMissileStrong()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileClusterStrong.class, new RenderMissileStrong()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileBusterStrong.class, new RenderMissileStrong()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileEMPStrong.class, new RenderMissileStrong()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileBurst.class, new RenderMissileHuge()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileInferno.class, new RenderMissileHuge()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileRain.class, new RenderMissileHuge()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileDrill.class, new RenderMissileHuge()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileNuclear.class, new RenderMissileNuclear()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileMirv.class, new RenderMissileMirv()); + RenderingRegistry.registerEntityRenderingHandler(EntityMIRV.class, new RenderMirv()); + RenderingRegistry.registerEntityRenderingHandler(EntityMissileDoomsday.class, new RenderMissileDoomsday()); + RenderingRegistry.registerEntityRenderingHandler(EntityCarrier.class, new RenderCarrierMissile()); + RenderingRegistry.registerEntityRenderingHandler(EntityBooster.class, new RenderBoosterMissile()); + RenderingRegistry.registerEntityRenderingHandler(EntitySoyuz.class, new RenderSoyuz()); + RenderingRegistry.registerEntityRenderingHandler(EntitySoyuzCapsule.class, new RenderSoyuzCapsule()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileTaint.class, new RenderMissileTaint()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileMicro.class, new RenderMissileTaint()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileBHole.class, new RenderMissileTaint()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileSchrabidium.class, new RenderMissileTaint()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileEMP.class, new RenderMissileTaint()); - - RenderingRegistry.registerEntityRenderingHandler(EntityAAShell.class, new RenderMirv()); - RenderingRegistry.registerEntityRenderingHandler(EntityRocketHoming.class, new RenderSRocket()); - RenderingRegistry.registerEntityRenderingHandler(EntityMissileEndo.class, new RenderMissileThermo()); RenderingRegistry.registerEntityRenderingHandler(EntityMissileExo.class, new RenderMissileThermo()); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlock.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBroadcaster.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityGeiger.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRadioRec.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRadiobox.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBomber.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineSatDock.class, new RenderDecoBlock()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAlt.class, new RenderDecoBlockAlt()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltG.class, new RenderDecoBlockAlt()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltW.class, new RenderDecoBlockAlt()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoBlockAltF.class, new RenderDecoBlockAlt()); - - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_wall), new ItemRenderDecoBlock()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_corner), new ItemRenderDecoBlock()); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_roof), new ItemRenderDecoBlock()); - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_beam), new ItemRenderDecoBlock()); - //MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.steel_scaffold), new ItemRenderDecoBlock()); - + //effects + RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudSmall.class, new RenderSmallNukeMK3()); + RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudBig.class, new RenderBigNuke()); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleija.class, new RenderCloudFleija()); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleijaRainbow.class, new RenderCloudRainbow()); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudSolinium.class, new RenderCloudSolinium()); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudTom.class, new RenderCloudTom()); + RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudNoShroom.class, new RenderNoCloud()); + RenderingRegistry.registerEntityRenderingHandler(EntityFalloutRain.class, new RenderFallout()); + RenderingRegistry.registerEntityRenderingHandler(EntityBlackHole.class, new RenderBlackHole()); + RenderingRegistry.registerEntityRenderingHandler(EntityVortex.class, new RenderBlackHole()); + RenderingRegistry.registerEntityRenderingHandler(EntityRagingVortex.class, new RenderBlackHole()); + RenderingRegistry.registerEntityRenderingHandler(EntityDeathBlast.class, new RenderDeathBlast()); + RenderingRegistry.registerEntityRenderingHandler(EntityNukeExplosionAdvanced.class, new RenderSnowball(ModItems.energy_ball)); + //minecarts + RenderingRegistry.registerEntityRenderingHandler(EntityMinecartTest.class, new RenderMinecartTest()); + //items + RenderingRegistry.registerEntityRenderingHandler(EntityMovingItem.class, new RenderMovingItem()); + //mobs RenderingRegistry.registerEntityRenderingHandler(EntityNuclearCreeper.class, new RenderNuclearCreeper()); RenderingRegistry.registerEntityRenderingHandler(EntityTaintedCreeper.class, new RenderTaintedCreeper()); RenderingRegistry.registerEntityRenderingHandler(EntityHunterChopper.class, new RenderHunterChopper()); @@ -458,14 +422,7 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityTeslaCrab.class, new RenderTeslaCrab()); RenderingRegistry.registerEntityRenderingHandler(EntityTaintCrab.class, new RenderTaintCrab()); RenderingRegistry.registerEntityRenderingHandler(EntityMaskMan.class, new RenderMaskMan()); - - RenderingRegistry.registerEntityRenderingHandler(EntityChopperMine.class, new RenderChopperMine()); - RenderingRegistry.registerEntityRenderingHandler(EntityRubble.class, new RenderRubble()); - RenderingRegistry.registerEntityRenderingHandler(EntityShrapnel.class, new RenderShrapnel()); - RenderingRegistry.registerEntityRenderingHandler(EntityOilSpill.class, new RenderEmpty()); - RenderingRegistry.registerEntityRenderingHandler(EntityWaterSplash.class, new RenderEmpty()); - RenderingRegistry.registerEntityRenderingHandler(EntityEMP.class, new RenderEmpty()); - + //"particles" RenderingRegistry.registerEntityRenderingHandler(EntitySmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.smoke1, ModItems.smoke2, ModItems.smoke3, ModItems.smoke4, ModItems.smoke5, ModItems.smoke6, ModItems.smoke7, ModItems.smoke8 })); RenderingRegistry.registerEntityRenderingHandler(EntityBSmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.b_smoke1, ModItems.b_smoke2, ModItems.b_smoke3, ModItems.b_smoke4, ModItems.b_smoke5, ModItems.b_smoke6, ModItems.b_smoke7, ModItems.b_smoke8 })); RenderingRegistry.registerEntityRenderingHandler(EntityDSmokeFX.class, new MultiCloudRenderer(new Item[] { ModItems.d_smoke1, ModItems.d_smoke2, ModItems.d_smoke3, ModItems.d_smoke4, ModItems.d_smoke5, ModItems.d_smoke6, ModItems.d_smoke7, ModItems.d_smoke8 })); @@ -482,6 +439,34 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityDischarge.class, new ElectricityRenderer(ModItems.discharge)); RenderingRegistry.registerEntityRenderingHandler(EntityEMPBlast.class, new RenderEMPBlast()); RenderingRegistry.registerEntityRenderingHandler(EntityTSmokeFX.class, new TSmokeRenderer(ModItems.nuclear_waste)); + } + + @Override + public void registerBlockRenderer() { + + RenderingRegistry.registerBlockHandler(new RenderTaintBlock()); + RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); + RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); + RenderingRegistry.registerBlockHandler(new RenderSteelBeam()); + RenderingRegistry.registerBlockHandler(new RenderBarrel()); + RenderingRegistry.registerBlockHandler(new RenderFence()); + RenderingRegistry.registerBlockHandler(new RenderBarbedWire()); + RenderingRegistry.registerBlockHandler(new RenderAntennaTop()); + RenderingRegistry.registerBlockHandler(new RenderConserve()); + RenderingRegistry.registerBlockHandler(new RenderConveyor()); + } + + @Override + public void registerRenderInfo() + { + MinecraftForge.EVENT_BUS.register(new ModEventHandlerClient()); + + AdvancedModelLoader.registerModelHandler(new HmfModelLoader()); + + registerTileEntitySpecialRenderer(); + registerItemRenderer(); + registerEntityRenderer(); + registerBlockRenderer(); RenderingRegistry.addNewArmourRendererPrefix("5"); RenderingRegistry.addNewArmourRendererPrefix("6"); @@ -506,11 +491,6 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.missile_custom, new ItemRenderMissile()); } - - @Override - public void registerTileEntitySpecialRenderer() { - - } @Deprecated @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 642e42f54..b868cb068 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -589,6 +589,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', "ingotIron", 'R', Blocks.furnace, 'B', "blockIron", 'P', Blocks.piston })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_siren, 1), new Object[] { "SIS", "ICI", "SRS", 'S', "plateSteel", 'I', ModItems.plate_polymer, 'C', ModItems.circuit_copper, 'R', "dustRedstone" })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.muffler, 1), new Object[] { "III", "IWI", "III", 'I', ModItems.plate_polymer, 'W', Blocks.wool }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 1), new Object[] { "PIP", "I I", "PIP", 'P', "plateTitanium", 'I', "ingotTitanium" })); GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_furnace), 1), new Object[] { "HMH", "MFM", "HMH", 'H', Item.getItemFromBlock(ModBlocks.factory_titanium_hull), 'M', ModItems.motor, 'F', Item.getItemFromBlock(Blocks.furnace) }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.factory_titanium_conductor), 1), new Object[] { "SWS", "FFF", "SWS", 'S', "ingotTitanium", 'W', Item.getItemFromBlock(ModBlocks.red_wire_coated), 'F', ModItems.fuse })); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 922d55f09..c7022fbfe 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -499,7 +499,6 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityAMSEmitter.class, "tileentity_ams_emitter"); GameRegistry.registerTileEntity(TileEntityAMSLimiter.class, "tileentity_ams_limiter"); GameRegistry.registerTileEntity(TileEntityMachineSiren.class, "tileentity_siren"); - GameRegistry.registerTileEntity(TileEntityTaint.class, "tileentity_taint"); GameRegistry.registerTileEntity(TileEntityMachineSPP.class, "tileentity_spp"); GameRegistry.registerTileEntity(TileEntityTurretSpitfire.class, "tileentity_turret_spitfire"); GameRegistry.registerTileEntity(TileEntityMachineRadGen.class, "tileentity_radgen"); diff --git a/src/main/java/com/hbm/main/ServerProxy.java b/src/main/java/com/hbm/main/ServerProxy.java index e4ea24690..6f855cd45 100644 --- a/src/main/java/com/hbm/main/ServerProxy.java +++ b/src/main/java/com/hbm/main/ServerProxy.java @@ -4,14 +4,13 @@ import com.hbm.sound.AudioWrapper; import net.minecraft.nbt.NBTTagCompound; -public class ServerProxy -{ - public void registerRenderInfo() - { - - } +public class ServerProxy { + public void registerRenderInfo() { } public void registerTileEntitySpecialRenderer() { } + public void registerItemRenderer() { } + public void registerEntityRenderer() { } + public void registerBlockRenderer() { } public void particleControl(double x, double y, double z, int type) { } diff --git a/src/main/java/com/hbm/render/item/ItemRenderTemplate.java b/src/main/java/com/hbm/render/item/ItemRenderTemplate.java index fd0fd3b47..ddbe70912 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderTemplate.java +++ b/src/main/java/com/hbm/render/item/ItemRenderTemplate.java @@ -8,16 +8,12 @@ import com.hbm.items.ModItems; import com.hbm.render.util.RenderItemStack; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; public class ItemRenderTemplate implements IItemRenderer { private ItemStack currentItem; - private RenderItem itemRenderer; - private RenderManager renderManager = RenderManager.instance; public boolean handleRenderType(ItemStack stack, IItemRenderer.ItemRenderType type) { diff --git a/src/main/java/com/hbm/render/item/ItemRenderDecoBlock.java b/src/main/java/com/hbm/render/item/block/ItemRenderDecoBlock.java similarity index 97% rename from src/main/java/com/hbm/render/item/ItemRenderDecoBlock.java rename to src/main/java/com/hbm/render/item/block/ItemRenderDecoBlock.java index f76d52df5..1e48e83ae 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderDecoBlock.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderDecoBlock.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderPoleTop.java b/src/main/java/com/hbm/render/item/block/ItemRenderPoleTop.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderPoleTop.java rename to src/main/java/com/hbm/render/item/block/ItemRenderPoleTop.java index db35b5efa..c966bdb30 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderPoleTop.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderPoleTop.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderSatelliteReceiver.java b/src/main/java/com/hbm/render/item/block/ItemRenderSatelliteReceiver.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderSatelliteReceiver.java rename to src/main/java/com/hbm/render/item/block/ItemRenderSatelliteReceiver.java index 1fab50ab2..39f3ec9d0 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderSatelliteReceiver.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderSatelliteReceiver.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderSteelPoles.java b/src/main/java/com/hbm/render/item/block/ItemRenderSteelPoles.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderSteelPoles.java rename to src/main/java/com/hbm/render/item/block/ItemRenderSteelPoles.java index 8f5551343..5af78716a 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderSteelPoles.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderSteelPoles.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderTapeRecorder.java b/src/main/java/com/hbm/render/item/block/ItemRenderTapeRecorder.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderTapeRecorder.java rename to src/main/java/com/hbm/render/item/block/ItemRenderTapeRecorder.java index 68b08ec6b..fc49686f3 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderTapeRecorder.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderTapeRecorder.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderTestContainer.java b/src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java similarity index 92% rename from src/main/java/com/hbm/render/item/ItemRenderTestContainer.java rename to src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java index cf9dd25c6..57e75111d 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderTestContainer.java +++ b/src/main/java/com/hbm/render/item/block/ItemRenderTestContainer.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.block; import com.hbm.tileentity.deco.TileEntityTestContainer; diff --git a/src/main/java/com/hbm/render/item/ItemRenderBFLauncher.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderBFLauncher.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java index 81f7bb2bd..d147ba15a 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderBFLauncher.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderBFLauncher.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderBaleflare.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderBaleflare.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java index b7ae76738..96671ff58 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderBaleflare.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderBaleflare.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderBigSword.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBigSword.java similarity index 94% rename from src/main/java/com/hbm/render/item/ItemRenderBigSword.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderBigSword.java index 6a1c7f989..0eeff20d4 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderBigSword.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderBigSword.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderBullshit.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderBullshit.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderBullshit.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderBullshit.java index 01f84e436..d66b937f2 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderBullshit.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderBullshit.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderCryolator.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderCryolator.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java index 99dded32d..ce1505174 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderCryolator.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderCryolator.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderEMPRay.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderEMPRay.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java index 1622bffc9..cf4889d23 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderEMPRay.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderEMPRay.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderFatMan.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderFatMan.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java index 844025f17..46d15b308 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderFatMan.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderFatMan.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderGunAnim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderGunAnim.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java index f821f3ed6..568debf84 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderGunAnim.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderGunAnim.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderImmolator.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderImmolator.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java index 0ee101757..f5d298186 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderImmolator.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderImmolator.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderMIRV.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderMIRV.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java index bbf909f05..db3d40b87 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderMIRV.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRV.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderMIRVLauncher.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderMIRVLauncher.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java index fc65850d8..94b31385c 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderMIRVLauncher.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderMIRVLauncher.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderMP.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java similarity index 94% rename from src/main/java/com/hbm/render/item/ItemRenderMP.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java index 686fc811d..8c957bd95 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderMP.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderMP40.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderMP40.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java index 1ad36e5d4..27f454765 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderMP40.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderMP40.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderMiniNuke.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderMiniNuke.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java index 071fde3e9..6a5d094dd 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderMiniNuke.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderMiniNuke.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderNukeGadget.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java similarity index 94% rename from src/main/java/com/hbm/render/item/ItemRenderNukeGadget.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java index 8dbeb2c50..2b188c95c 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderNukeGadget.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderNukeGadget.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderOSIPR.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderOSIPR.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java index 6e9d6a5c8..9dd1937ae 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderOSIPR.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderOSIPR.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderObj.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderObj.java similarity index 97% rename from src/main/java/com/hbm/render/item/ItemRenderObj.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderObj.java index f77005578..b6c9b5b14 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderObj.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderObj.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderOverkill.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderOverkill.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java index 91ca01146..35f7b5782 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderOverkill.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderOverkill.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRedstoneSword.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRedstoneSword.java similarity index 93% rename from src/main/java/com/hbm/render/item/ItemRenderRedstoneSword.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRedstoneSword.java index 59864138b..30cb88804 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRedstoneSword.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRedstoneSword.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolver.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolver.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java index f06057d4a..b7f8ce1c0 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolver.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolver.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverCursed.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverCursed.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java index a3864186a..937c936bb 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverCursed.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverCursed.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverGold.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverGold.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java index 5e85b6576..76cb564ea 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverGold.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverGold.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverInverted.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverInverted.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java index 210f64509..bca1b4408 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverInverted.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverInverted.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverIron.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverIron.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java index d0a33f2f6..a84199cf8 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverIron.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverIron.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverLead.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverLead.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java index dc76101e3..6833e5184 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverLead.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverLead.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverNightmare.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverNightmare.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverNightmare.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverNightmare.java index bb7f027aa..900012ce6 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverNightmare.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverNightmare.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRevolverSchrabidium.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderRevolverSchrabidium.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java index 70c8b7657..0766c6fb5 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRevolverSchrabidium.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRevolverSchrabidium.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRocket.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRocket.java similarity index 94% rename from src/main/java/com/hbm/render/item/ItemRenderRocket.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRocket.java index 84846d5b3..8a2533a48 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRocket.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRocket.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderRpg.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java similarity index 96% rename from src/main/java/com/hbm/render/item/ItemRenderRpg.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java index 78250d216..7b4b427b5 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderRpg.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderRpg.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderShim.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderShim.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java index 94b465e49..69429c4ea 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderShim.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderShim.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderStinger.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderStinger.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java index ef66261ab..b458e447a 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderStinger.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderStinger.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderTestBombAdvanced.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderTestBombAdvanced.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java index cfcbcbc68..9b4c26be1 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderTestBombAdvanced.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderTestBombAdvanced.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderUZI.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderUZI.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java index dae5773eb..75466cb35 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderUZI.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderUZI.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderUboinik.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java similarity index 98% rename from src/main/java/com/hbm/render/item/ItemRenderUboinik.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java index b029be207..173716ef6 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderUboinik.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderUboinik.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponObj.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponObj.java index c65aaab51..8e916da2b 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderWeaponObj.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponObj.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderWeaponQuadro.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderWeaponQuadro.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java index 34a346b99..dd53f4568 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderWeaponQuadro.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponSauer.java similarity index 99% rename from src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponSauer.java index 6870f7710..9d4d204de 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderWeaponSauer.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponSauer.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderXVL1456.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderXVL1456.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderXVL1456.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderXVL1456.java index 6bd0e8b05..dacfc20b4 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderXVL1456.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderXVL1456.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/item/ItemRenderZOMG.java b/src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java similarity index 95% rename from src/main/java/com/hbm/render/item/ItemRenderZOMG.java rename to src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java index 082d9317f..548817777 100644 --- a/src/main/java/com/hbm/render/item/ItemRenderZOMG.java +++ b/src/main/java/com/hbm/render/item/weapon/ItemRenderZOMG.java @@ -1,4 +1,4 @@ -package com.hbm.render.item; +package com.hbm.render.item.weapon; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/hbm/render/tileentity/RenderTaint.java b/src/main/java/com/hbm/render/tileentity/RenderTaint.java deleted file mode 100644 index f842c55e5..000000000 --- a/src/main/java/com/hbm/render/tileentity/RenderTaint.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.hbm.render.tileentity; - -import org.lwjgl.opengl.GL11; - -import com.hbm.render.loader.RUVertice; -import com.hbm.tileentity.deco.TileEntityTaint; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - - -public class RenderTaint extends TileEntitySpecialRenderer -{ - float s = 0.5F; - - RUVertice v1 = new RUVertice(s, s, s); - RUVertice v2 = new RUVertice(s, s, -s); - RUVertice v3 = new RUVertice(-s, s, -s); - RUVertice v4 = new RUVertice(-s, s, s); - - RUVertice v5 = new RUVertice(s, -s, s); - RUVertice v6 = new RUVertice(s, -s, -s); - RUVertice v7 = new RUVertice(-s, -s, -s); - RUVertice v8 = new RUVertice(-s, -s, s); - - public void renderAModelAt(TileEntityTaint tile, double x, double y, double z, float f) - { - World world = tile.getWorldObj(); - - boolean ceil = world.isBlockNormalCubeDefault(tile.xCoord, tile.yCoord + 1, tile.zCoord, false); - boolean floor = world.isBlockNormalCubeDefault(tile.xCoord, tile.yCoord - 1, tile.zCoord, false); - boolean side1 = world.isBlockNormalCubeDefault(tile.xCoord, tile.yCoord, tile.zCoord + 1, false); - boolean side2 = world.isBlockNormalCubeDefault(tile.xCoord - 1, tile.yCoord, tile.zCoord, false); - boolean side3 = world.isBlockNormalCubeDefault(tile.xCoord, tile.yCoord, tile.zCoord - 1, false); - boolean side4 = world.isBlockNormalCubeDefault(tile.xCoord + 1, tile.yCoord, tile.zCoord, false); - - int meta = tile.getBlockMetadata(); - - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation("hbm:textures/blocks/taint_" + meta + ".png")); - - GL11.glDisable(GL11.GL_LIGHTING); - Tessellator tessellator = Tessellator.instance; - - if (side1) - { - tessellator.startDrawingQuads(); - addVertex(v1, 0, 0, true); - addVertex(v5, 1, 0, true); - addVertex(v8, 1, 1, true); - addVertex(v4, 0, 1, true); - tessellator.draw(); - } - - if (side2) - { - tessellator.startDrawingQuads(); - addVertex(v4, 0, 0, true); - addVertex(v8, 1, 0, true); - addVertex(v7, 1, 1, true); - addVertex(v3, 0, 1, true); - tessellator.draw(); - } - - if (side3) - { - tessellator.startDrawingQuads(); - addVertex(v3, 0, 0, true); - addVertex(v7, 1, 0, true); - addVertex(v6, 1, 1, true); - addVertex(v2, 0, 1, true); - tessellator.draw(); - } - - if (side4) - { - tessellator.startDrawingQuads(); - addVertex(v2, 0, 0, true); - addVertex(v6, 1, 0, true); - addVertex(v5, 1, 1, true); - addVertex(v1, 0, 1, true); - tessellator.draw(); - } - - if (ceil) - { - tessellator.startDrawingQuads(); - addVertex(v4, 0, 0, true); - addVertex(v3, 1, 0, true); - addVertex(v2, 1, 1, true); - addVertex(v1, 0, 1, true); - tessellator.draw(); - } - - if (floor) - { - tessellator.startDrawingQuads(); - addVertex(v5, 0, 0, true); - addVertex(v6, 1, 0, true); - addVertex(v7, 1, 1, true); - addVertex(v8, 0, 1, true); - tessellator.draw(); - } - - GL11.glPopMatrix(); - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double d, double d1, double d2, float f) - { - renderAModelAt((TileEntityTaint) tileentity, d, d1, d2, f); - } - - private void addVertex(RUVertice v, double t, double t2, boolean offset) - { - Tessellator tessellator = Tessellator.instance; - tessellator.addVertexWithUV(v.x * 0.99, v.y * 0.99, v.z * 0.99, t, t2); - } -} diff --git a/src/main/java/com/hbm/render/tileentity/RenderTapeRecorder.java b/src/main/java/com/hbm/render/tileentity/RenderTapeRecorder.java deleted file mode 100644 index 0d01ee957..000000000 --- a/src/main/java/com/hbm/render/tileentity/RenderTapeRecorder.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hbm.render.tileentity; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelTapeRecorder; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -public class RenderTapeRecorder extends TileEntitySpecialRenderer { - - private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelTapeRecorder.png"); - - private ModelTapeRecorder model; - private int i = 0; - - public RenderTapeRecorder() { - this.model = new ModelTapeRecorder(); - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GL11.glRotatef(180, 0F, 0F, 1F); - - switch(tileentity.getBlockMetadata()) - { - case 5: - GL11.glRotatef(90, 0F, 1F, 0F); break; - case 3: - GL11.glRotatef(180, 0F, 1F, 0F); break; - case 4: - GL11.glRotatef(270, 0F, 1F, 0F); break; - case 2: - GL11.glRotatef(0, 0F, 1F, 0F); break; - } - - this.bindTexture(texture); - - GL11.glPushMatrix(); - this.model.renderModel(0.0625F); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - } - -} diff --git a/src/main/java/com/hbm/render/tileentity/RenderTestContainer.java b/src/main/java/com/hbm/render/tileentity/RenderTestContainer.java deleted file mode 100644 index d3a6442c7..000000000 --- a/src/main/java/com/hbm/render/tileentity/RenderTestContainer.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.hbm.render.tileentity; - -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import java.util.Calendar; - -import net.minecraft.block.Block; -import net.minecraft.client.model.ModelChest; -import net.minecraft.client.model.ModelLargeChest; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import com.hbm.blocks.test.TestContainer; -import com.hbm.lib.RefStrings; -import com.hbm.tileentity.deco.TileEntityTestContainer; - -@SideOnly(Side.CLIENT) -public class RenderTestContainer extends TileEntitySpecialRenderer -{ - private static final ResourceLocation field_147505_d = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/test_container_double.png"); - private static final ResourceLocation field_147504_g = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/test_container_single.png"); - private ModelChest field_147510_h = new ModelChest(); - private ModelChest field_147511_i = new ModelLargeChest(); - private boolean field_147509_j; - private static final String __OBFID = "CL_00000965"; - - public RenderTestContainer() - { - Calendar calendar = Calendar.getInstance(); - - if (calendar.get(2) + 1 == 12 && calendar.get(5) >= 24 && calendar.get(5) <= 26) - { - this.field_147509_j = true; - } - } - - public void renderTileEntityAt(TileEntityTestContainer p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) - { - int i; - - if (!p_147500_1_.hasWorldObj()) - { - i = 0; - } - else - { - Block block = p_147500_1_.getBlockType(); - i = p_147500_1_.getBlockMetadata(); - - if (block instanceof TestContainer && i == 0) - { - try - { - ((TestContainer)block).func_149954_e(p_147500_1_.getWorldObj(), p_147500_1_.xCoord, p_147500_1_.yCoord, p_147500_1_.zCoord); - } - catch (ClassCastException e) - { - FMLLog.severe("Attempted to render a chest at %d, %d, %d that was not a chest", p_147500_1_.xCoord, p_147500_1_.yCoord, p_147500_1_.zCoord); - } - i = p_147500_1_.getBlockMetadata(); - } - - p_147500_1_.checkForAdjacentChests(); - } - - if (p_147500_1_.adjacentChestZNeg == null && p_147500_1_.adjacentChestXNeg == null) - { - ModelChest modelchest; - - if (p_147500_1_.adjacentChestXPos == null && p_147500_1_.adjacentChestZPos == null) - { - modelchest = this.field_147510_h; - - this.bindTexture(field_147504_g); - } - else - { - modelchest = this.field_147511_i; - - this.bindTexture(field_147505_d); - } - - GL11.glPushMatrix(); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef((float)p_147500_2_, (float)p_147500_4_ + 1.0F, (float)p_147500_6_ + 1.0F); - GL11.glScalef(1.0F, -1.0F, -1.0F); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - short short1 = 0; - - if (i == 2) - { - short1 = 180; - } - - if (i == 3) - { - short1 = 0; - } - - if (i == 4) - { - short1 = 90; - } - - if (i == 5) - { - short1 = -90; - } - - if (i == 2 && p_147500_1_.adjacentChestXPos != null) - { - GL11.glTranslatef(1.0F, 0.0F, 0.0F); - } - - if (i == 5 && p_147500_1_.adjacentChestZPos != null) - { - GL11.glTranslatef(0.0F, 0.0F, -1.0F); - } - - GL11.glRotatef(short1, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - float f1 = p_147500_1_.prevLidAngle + (p_147500_1_.lidAngle - p_147500_1_.prevLidAngle) * p_147500_8_; - float f2; - - if (p_147500_1_.adjacentChestZNeg != null) - { - f2 = p_147500_1_.adjacentChestZNeg.prevLidAngle + (p_147500_1_.adjacentChestZNeg.lidAngle - p_147500_1_.adjacentChestZNeg.prevLidAngle) * p_147500_8_; - - if (f2 > f1) - { - f1 = f2; - } - } - - if (p_147500_1_.adjacentChestXNeg != null) - { - f2 = p_147500_1_.adjacentChestXNeg.prevLidAngle + (p_147500_1_.adjacentChestXNeg.lidAngle - p_147500_1_.adjacentChestXNeg.prevLidAngle) * p_147500_8_; - - if (f2 > f1) - { - f1 = f2; - } - } - - f1 = 1.0F - f1; - f1 = 1.0F - f1 * f1 * f1; - modelchest.chestLid.rotateAngleX = -(f1 * (float)Math.PI / 2.0F); - modelchest.renderAll(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - } - - @Override - public void renderTileEntityAt(TileEntity p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_) - { - this.renderTileEntityAt((TileEntityTestContainer)p_147500_1_, p_147500_2_, p_147500_4_, p_147500_6_, p_147500_8_); - } -} \ No newline at end of file diff --git a/src/main/java/com/hbm/render/tileentity/RenderYellowBarrel.java b/src/main/java/com/hbm/render/tileentity/RenderYellowBarrel.java deleted file mode 100644 index bbcfaf6d5..000000000 --- a/src/main/java/com/hbm/render/tileentity/RenderYellowBarrel.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hbm.render.tileentity; - -import org.lwjgl.opengl.GL11; - -import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelTestRender; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -public class RenderYellowBarrel extends TileEntitySpecialRenderer { - - private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":" + "textures/models/ModelYellowBarrel.png"); - - private ModelTestRender model; - - public RenderYellowBarrel() { - this.model = new ModelTestRender(); - } - - @Override - public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float f) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GL11.glRotatef(180, 0F, 0F, 1F); - - this.bindTexture(texture); - - GL11.glPushMatrix(); - this.model.renderModel(0.0625F); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - } -} diff --git a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java index ba57bc629..45598ef1e 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java +++ b/src/main/java/com/hbm/tileentity/TileEntityMachineBase.java @@ -1,5 +1,6 @@ package com.hbm.tileentity; +import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.Spaghetti; import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.NBTPacket; @@ -12,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTank; @Spaghetti("Not spaghetti in itself, but for the love of god please use this base class for all machines") @@ -198,4 +200,22 @@ public abstract class TileEntityMachineBase extends TileEntity implements ISided } nbt.setTag("items", list); } + + public int countMufflers() { + + int count = 0; + + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) + if(worldObj.getBlock(xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ) == ModBlocks.muffler) + count++; + + return count; + } + + public float getVolume(int toSilence) { + + float volume = 1 - (countMufflers() / (float)toSilence); + + return Math.max(volume, 0); + } } diff --git a/src/main/java/com/hbm/tileentity/deco/TileEntityTaint.java b/src/main/java/com/hbm/tileentity/deco/TileEntityTaint.java deleted file mode 100644 index b06d217f2..000000000 --- a/src/main/java/com/hbm/tileentity/deco/TileEntityTaint.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.hbm.tileentity.deco; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.tileentity.TileEntity; - -public class TileEntityTaint extends TileEntity { - - @Override - @SideOnly(Side.CLIENT) - public double getMaxRenderDistanceSquared() - { - return 65536.0D; - } -} diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index c8f0c9533..a3b6ec871 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -12,22 +12,13 @@ import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.FluidTank; import com.hbm.items.ModItems; import com.hbm.lib.Library; -import com.hbm.packet.AuxElectricityPacket; -import com.hbm.packet.AuxGaugePacket; -import com.hbm.packet.PacketDispatcher; +import com.hbm.tileentity.TileEntityMachineBase; import api.hbm.energy.IBatteryItem; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -public class TileEntityMachineDiesel extends TileEntity implements ISidedInventory, ISource, IFluidContainer, IFluidAcceptor { - - private ItemStack slots[]; +public class TileEntityMachineDiesel extends TileEntityMachineBase implements ISource, IFluidContainer, IFluidAcceptor { public long power; public int soundCycle = 0; @@ -41,77 +32,14 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento private static final int[] slots_bottom = new int[] { 1, 2 }; private static final int[] slots_side = new int[] { 2 }; - private String customName; - public TileEntityMachineDiesel() { - slots = new ItemStack[5]; + super(5); tank = new FluidTank(FluidType.DIESEL, 16000, 0); } @Override - public int getSizeInventory() { - return slots.length; - } - - @Override - public ItemStack getStackInSlot(int i) { - return slots[i]; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - if (slots[i] != null) { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } else { - return null; - } - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemStack) { - slots[i] = itemStack; - if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) { - itemStack.stackSize = getInventoryStackLimit(); - } - } - - @Override - public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.machineDiesel"; - } - - @Override - public boolean hasCustomInventoryName() { - return this.customName != null && this.customName.length() > 0; - } - - public void setCustomName(String name) { - this.customName = name; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) { - if (worldObj.getTileEntity(xCoord, yCoord, zCoord) != this) { - return false; - } else { - return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <= 64; - } - } - - // You scrubs aren't needed for anything (right now) - @Override - public void openInventory() { - } - - @Override - public void closeInventory() { + public String getName() { + return "container.machineDiesel"; } @Override @@ -126,61 +54,22 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento return false; } - @Override - public ItemStack decrStackSize(int i, int j) { - if (slots[i] != null) { - if (slots[i].stackSize <= j) { - ItemStack itemStack = slots[i]; - slots[i] = null; - return itemStack; - } - ItemStack itemStack1 = slots[i].splitStack(j); - if (slots[i].stackSize == 0) { - slots[i] = null; - } - - return itemStack1; - } else { - return null; - } - } - @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - NBTTagList list = nbt.getTagList("items", 10); this.power = nbt.getLong("powerTime"); this.powerCap = nbt.getLong("powerCap"); tank.readFromNBT(nbt, "fuel"); - slots = new ItemStack[getSizeInventory()]; - - for (int i = 0; i < list.tagCount(); i++) { - NBTTagCompound nbt1 = list.getCompoundTagAt(i); - byte b0 = nbt1.getByte("slot"); - if (b0 >= 0 && b0 < slots.length) { - slots[b0] = ItemStack.loadItemStackFromNBT(nbt1); - } - } } @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); + nbt.setLong("powerTime", power); nbt.setLong("powerCap", powerCap); tank.writeToNBT(nbt, "fuel"); - NBTTagList list = new NBTTagList(); - - for (int i = 0; i < slots.length; i++) { - if (slots[i] != null) { - NBTTagCompound nbt1 = new NBTTagCompound(); - nbt1.setByte("slot", (byte) i); - slots[i].writeToNBT(nbt1); - list.appendTag(nbt1); - } - } - nbt.setTag("items", list); } @Override @@ -188,11 +77,6 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento return p_94128_1_ == 0 ? slots_bottom : (p_94128_1_ == 1 ? slots_top : slots_side); } - @Override - public boolean canInsertItem(int i, ItemStack itemStack, int j) { - return this.isItemValidForSlot(i, itemStack); - } - @Override public boolean canExtractItem(int i, ItemStack itemStack, int j) { if (i == 1) @@ -211,7 +95,8 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento @Override public void updateEntity() { - if (!worldObj.isRemote) { + + if(!worldObj.isRemote) { age++; if (age >= 20) { age = 0; @@ -236,11 +121,19 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento generate(); - PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); - PacketDispatcher.wrapper.sendToAllAround(new AuxGaugePacket(xCoord, yCoord, zCoord, (int)powerCap, 0), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); + NBTTagCompound data = new NBTTagCompound(); + data.setInteger("power", (int) power); + data.setInteger("powerCap", (int) powerCap); + this.networkPack(data, 50); } } + public void networkUnpack(NBTTagCompound data) { + + power = data.getInteger("power"); + powerCap = data.getInteger("powerCap"); + } + public boolean hasAcceptableFuel() { return getHEFromFuel() > 0; } @@ -259,20 +152,17 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento } public void generate() { + if (hasAcceptableFuel()) { if (tank.getFill() > 0) { + if (soundCycle == 0) { - //if (tank.getTankType().name().equals(FluidType.) > 0) - // this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", 1.0F, 1.0F); - //else - this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", 1.0F, 0.5F); + this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "fireworks.blast", 1.5F * this.getVolume(3), 0.5F); } soundCycle++; if (soundCycle >= 3) soundCycle = 0; - //if (this.superTimer > 0) - // soundCycle = 0; tank.setFill(tank.getFill() - 10); if (tank.getFill() < 0)