diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index eb650e81b..8f7dc087c 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -288,6 +288,18 @@ item.powder_titanium.name=Titanstaub item.powder_tungsten.name=Wolframstaub item.powder_uranium.name=Uranstaub item.dust.name=Staub +item.powder_coal.name=Kohlestaub +item.powder_lapis.name=Lapis Lazuli-Staub +item.powder_emerald.name=Smaragdstaub +item.powder_diamond.name=Diamantstaub +item.powder_red_copper.name=Roter Kupfer Staub +item.powder_steel.name=Stahlstaub +item.powder_magnetized_tungsten.name=Magnetisierter Wolframstaub +item.powder_combine_steel.name=CMB-Stahlstaustaub +item.powder_lithium.name=Lithiumstaub +item.powder_advanced_alloy.name=Fortgeschrittener Legierungsstaub +item.powder_quartz.name=Quarzstaub +item.powder_power.name=Energiepulver item.battery_generic.name=Batterie item.battery_advanced.name=Fortgeschrittene Batterie @@ -323,6 +335,9 @@ item.cell_sas3.name=Schrabidiumtrisulfat-Zelle item.cell_anti_schrabidium.name=Antischrabidiumzelle item.singularity.name=Singularität item.singularity_counter_resonant.name=Eingefasste nicht-resonante Singularität +item.singularity_super_heated.name=Supererhitzte resonante Singularität +item.black_hole.name=Miniatur Schwarzes Loch +item.crystal_xen.name=Künstlicher Xen-Kristall item.inf_water.name=Unendlicher Wassertank item.inf_deuterium.name=Unendlicher Deuteriumtank @@ -451,6 +466,7 @@ item.grenade_plasma.name=Plasmagranate item.grenade_tau.name=Taugranate item.grenade_schrabidium.name=Schrabidiumgranate item.grenade_lemon.name=Zitronengranate +item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas" item.grenade_nuke.name=Mark VI Bohrgranate item.grenade_nuclear.name=Nuka-Granate @@ -514,16 +530,20 @@ tile.steel_scaffold.name=Stahlgerüst item.gun_revolver_iron.name=Einfacher Revolver item.gun_revolver.name=Verbesserter Revolver item.gun_revolver_gold.name=Goldener Revolver +item.gun_revolver_lead.name=Nuka-Revolver item.gun_revolver_schrabidium.name=Schrabidiumrevolver item.gun_revolver_cursed.name=Verfluchte Pistole item.gun_fatman.name=M42 Nukleares Katapult "Fat Man" item.gun_xvl1456.name=XVL1456 Tau-Kanone Prototyp item.gun_osipr.name=Standartausrüstung für Sicherheitskräfte item.gun_zomg.name=Singularitätsbetriebener Paarvernichtungsstrahl "ZOMG Kanone" +item.gun_super_shotgun.name=Super Shotgun +item.gun_moist_nugget.name=Moisn-Nagant item.gun_revolver_iron_ammo.name=Patrone item.gun_revolver_ammo.name=Bleipatrone item.gun_revolver_gold_ammo.name=Goldene Kugel +item.gun_revolver_lead_ammo.name=Mit Glas umhüllte Atompatrone item.gun_revolver_schrabidium_ammo.name=Schrabidiumpatrone item.gun_revolver_cursed_ammo.name=Stahlpatrone item.gun_fatman_ammo.name=Miniatombombe @@ -724,6 +744,7 @@ item.matchstick.name=Streichholz item.redcoil_capacitor.name=Rotspulenkondensator item.detonator.name=Fernzünder +item.crate_caller.name=Nachschub-Requester item.ingot_hes.name=Stark angereicherter Schrabidiumkernbrennstoffbarren item.ingot_les.name=Schwach angereicherter Schrabidiumkernbrennstoffbarren diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 081351e09..9d7b69d2d 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -288,6 +288,18 @@ item.powder_titanium.name=Titanium Powder item.powder_tungsten.name=Tungsten Powder item.powder_uranium.name=Uranium Powder item.dust.name=Dust +item.powder_coal.name=Coal Powder +item.powder_lapis.name=Lapis Lazuli Powder +item.powder_emerald.name=Emerald Powder +item.powder_diamond.name=Diamond Powder +item.powder_red_copper.name=Red Copper Powder +item.powder_steel.name=Steel Powder +item.powder_magnetized_tungsten.name=Magnetized Tungsten Powder +item.powder_combine_steel.name=CMB Steel Powder +item.powder_lithium.name=Lithium Powder +item.powder_advanced_alloy.name=Advanced Alloy Powder +item.powder_quartz.name=Quartz Powder +item.powder_power.name=Energy Powder item.battery_generic.name=Battery item.battery_advanced.name=Advanced Battery @@ -323,6 +335,9 @@ item.cell_sas3.name=Schrabidium Trisulfide Cell item.cell_anti_schrabidium.name=Antischrabidium Cell item.singularity.name=Singularity item.singularity_counter_resonant.name=Contained Counter-Resonant Singularity +item.singularity_super_heated.name=Superheated Resonating Singularity +item.black_hole.name=Miniature Black Hole +item.crystal_xen.name=Artificial Xen Crystal item.inf_water.name=Infinite Water Tank item.inf_deuterium.name=Infinite Deuterium Tank @@ -451,6 +466,7 @@ item.grenade_plasma.name=Plasma Grenade item.grenade_tau.name=Tau Grenade item.grenade_schrabidium.name=Schrabidium Grenade item.grenade_lemon.name=Combustible Lemon +item.grenade_mk2.name=Mk 2 Grenade "Ambassador Pineapple" item.grenade_nuke.name=Mark VI Drill Grenade item.grenade_nuclear.name=Nuka Grenade @@ -514,16 +530,20 @@ tile.steel_scaffold.name=Steel Scaffold item.gun_revolver_iron.name=Simple Revolver item.gun_revolver.name=Enhanced Revolver item.gun_revolver_gold.name=Golden Revolver +item.gun_revolver_lead.name=Nuka Revolver item.gun_revolver_schrabidium.name=Schrabidium Revolver item.gun_revolver_cursed.name=Cursed Revolver item.gun_fatman.name=M42 Nuclear Catapult "Fat Man" item.gun_xvl1456.name=XVL1456 Tau Cannon Prototype item.gun_osipr.name=Overwatch Standard Issue Pulse Rifle item.gun_zomg.name=Singularity Powered Annihilation Ray "ZOMG Cannon" +item.gun_super_shotgun.name=Super Shotgun +item.gun_moist_nugget.name=Moisn-Nagant item.gun_revolver_iron_ammo.name=Bullet item.gun_revolver_ammo.name=Lead Bullet item.gun_revolver_gold_ammo.name=Golden Bullet +item.gun_revolver_lead_ammo.name=Glass Covered Nuclear Bullet item.gun_revolver_schrabidium_ammo.name=Schrabidium Bullet item.gun_revolver_cursed_ammo.name=Steel Bullet item.gun_fatman_ammo.name=Mini Nuke @@ -724,6 +744,7 @@ item.matchstick.name=Matchstick item.redcoil_capacitor.name=Redcoil Capacitor item.detonator.name=Detonator +item.crate_caller.name=Supply Drop Requester item.ingot_hes.name=Highly Enriched Schrabidium Fuel Ingot item.ingot_les.name=Low Enriched Schrabidium Fuel Ingot diff --git a/assets/hbm/textures/blocks/machine_shredder_bottom_alt.png b/assets/hbm/textures/blocks/machine_shredder_bottom_alt.png new file mode 100644 index 000000000..be4b6d73c Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_bottom_alt.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_front_alt.png b/assets/hbm/textures/blocks/machine_shredder_front_alt.png new file mode 100644 index 000000000..7049ae709 Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_front_alt.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_side_alt.png b/assets/hbm/textures/blocks/machine_shredder_side_alt.png new file mode 100644 index 000000000..de74959ec Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_side_alt.png differ diff --git a/assets/hbm/textures/blocks/machine_shredder_top_alt.png b/assets/hbm/textures/blocks/machine_shredder_top_alt.png new file mode 100644 index 000000000..a1c241c4c Binary files /dev/null and b/assets/hbm/textures/blocks/machine_shredder_top_alt.png differ diff --git a/assets/hbm/textures/gui/gui_fwatz_multiblock.png b/assets/hbm/textures/gui/gui_fwatz_multiblock.png new file mode 100644 index 000000000..126d7f3d8 Binary files /dev/null and b/assets/hbm/textures/gui/gui_fwatz_multiblock.png differ diff --git a/assets/hbm/textures/items/coil_magnetized_tungsten.png b/assets/hbm/textures/items/coil_magnetized_tungsten.png new file mode 100644 index 000000000..149d1c432 Binary files /dev/null and b/assets/hbm/textures/items/coil_magnetized_tungsten.png differ diff --git a/assets/hbm/textures/items/crate_caller.png b/assets/hbm/textures/items/crate_caller.png new file mode 100644 index 000000000..c1795d5fc Binary files /dev/null and b/assets/hbm/textures/items/crate_caller.png differ diff --git a/assets/hbm/textures/items/crystal_xen.png b/assets/hbm/textures/items/crystal_xen.png new file mode 100644 index 000000000..2ff3f012f Binary files /dev/null and b/assets/hbm/textures/items/crystal_xen.png differ diff --git a/assets/hbm/textures/items/grenade_mk2.png b/assets/hbm/textures/items/grenade_mk2.png new file mode 100644 index 000000000..0a6da1a30 Binary files /dev/null and b/assets/hbm/textures/items/grenade_mk2.png differ diff --git a/assets/hbm/textures/items/grenade_mk2_alt.png b/assets/hbm/textures/items/grenade_mk2_alt.png new file mode 100644 index 000000000..452522c76 Binary files /dev/null and b/assets/hbm/textures/items/grenade_mk2_alt.png differ diff --git a/assets/hbm/textures/items/gun_moist_nugget.png b/assets/hbm/textures/items/gun_moist_nugget.png new file mode 100644 index 000000000..ae84c07f1 Binary files /dev/null and b/assets/hbm/textures/items/gun_moist_nugget.png differ diff --git a/assets/hbm/textures/items/gun_revolver_lead.png b/assets/hbm/textures/items/gun_revolver_lead.png new file mode 100644 index 000000000..4ecd5014b Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_lead.png differ diff --git a/assets/hbm/textures/items/gun_revolver_lead_ammo.png b/assets/hbm/textures/items/gun_revolver_lead_ammo.png new file mode 100644 index 000000000..3834c6de9 Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_lead_ammo.png differ diff --git a/assets/hbm/textures/items/gun_super_shotgun.png b/assets/hbm/textures/items/gun_super_shotgun.png new file mode 100644 index 000000000..c8c8f39cb Binary files /dev/null and b/assets/hbm/textures/items/gun_super_shotgun.png differ diff --git a/assets/hbm/textures/items/letter.png b/assets/hbm/textures/items/letter.png new file mode 100644 index 000000000..3111bd743 Binary files /dev/null and b/assets/hbm/textures/items/letter.png differ diff --git a/assets/hbm/textures/items/powder_advanced_alloy.png b/assets/hbm/textures/items/powder_advanced_alloy.png new file mode 100644 index 000000000..029ff191a Binary files /dev/null and b/assets/hbm/textures/items/powder_advanced_alloy.png differ diff --git a/assets/hbm/textures/items/powder_combine_steel.png b/assets/hbm/textures/items/powder_combine_steel.png new file mode 100644 index 000000000..951f6ed09 Binary files /dev/null and b/assets/hbm/textures/items/powder_combine_steel.png differ diff --git a/assets/hbm/textures/items/powder_emerald.png b/assets/hbm/textures/items/powder_emerald.png new file mode 100644 index 000000000..09520b6fa Binary files /dev/null and b/assets/hbm/textures/items/powder_emerald.png differ diff --git a/assets/hbm/textures/items/powder_energy.png b/assets/hbm/textures/items/powder_energy.png new file mode 100644 index 000000000..109601817 Binary files /dev/null and b/assets/hbm/textures/items/powder_energy.png differ diff --git a/assets/hbm/textures/items/powder_lapis.png b/assets/hbm/textures/items/powder_lapis.png new file mode 100644 index 000000000..5262d57f2 Binary files /dev/null and b/assets/hbm/textures/items/powder_lapis.png differ diff --git a/assets/hbm/textures/items/powder_lithium.png b/assets/hbm/textures/items/powder_lithium.png new file mode 100644 index 000000000..2def3fee1 Binary files /dev/null and b/assets/hbm/textures/items/powder_lithium.png differ diff --git a/assets/hbm/textures/items/powder_magnetized_tungsten.png b/assets/hbm/textures/items/powder_magnetized_tungsten.png new file mode 100644 index 000000000..984624b71 Binary files /dev/null and b/assets/hbm/textures/items/powder_magnetized_tungsten.png differ diff --git a/assets/hbm/textures/items/powder_quartz.png b/assets/hbm/textures/items/powder_quartz.png new file mode 100644 index 000000000..bd1157268 Binary files /dev/null and b/assets/hbm/textures/items/powder_quartz.png differ diff --git a/assets/hbm/textures/items/powder_red_copper.png b/assets/hbm/textures/items/powder_red_copper.png new file mode 100644 index 000000000..684c597db Binary files /dev/null and b/assets/hbm/textures/items/powder_red_copper.png differ diff --git a/assets/hbm/textures/items/powder_steel.png b/assets/hbm/textures/items/powder_steel.png new file mode 100644 index 000000000..7027b9e29 Binary files /dev/null and b/assets/hbm/textures/items/powder_steel.png differ diff --git a/assets/hbm/textures/items/singularity_2.png b/assets/hbm/textures/items/singularity_2.png new file mode 100644 index 000000000..610a975db Binary files /dev/null and b/assets/hbm/textures/items/singularity_2.png differ diff --git a/assets/hbm/textures/items/singularity_3.png b/assets/hbm/textures/items/singularity_3.png new file mode 100644 index 000000000..0ff6bd5d2 Binary files /dev/null and b/assets/hbm/textures/items/singularity_3.png differ diff --git a/assets/hbm/textures/items/singularity_4.png b/assets/hbm/textures/items/singularity_4.png new file mode 100644 index 000000000..b0782bb36 Binary files /dev/null and b/assets/hbm/textures/items/singularity_4.png differ diff --git a/assets/hbm/textures/models/BlastFleija.png b/assets/hbm/textures/models/BlastFleija.png new file mode 100644 index 000000000..f9fc96354 Binary files /dev/null and b/assets/hbm/textures/models/BlastFleija.png differ diff --git a/assets/hbm/textures/models/ModelRevolverLead.png b/assets/hbm/textures/models/ModelRevolverLead.png new file mode 100644 index 000000000..69ed11934 Binary files /dev/null and b/assets/hbm/textures/models/ModelRevolverLead.png differ diff --git a/assets/hbm/textures/models/ModelZOMG.png b/assets/hbm/textures/models/ModelZOMG.png new file mode 100644 index 000000000..941fae77b Binary files /dev/null and b/assets/hbm/textures/models/ModelZOMG.png differ diff --git a/com/hbm/blocks/BlockCable.java b/com/hbm/blocks/BlockCable.java index b3577adf4..86e0e03a1 100644 --- a/com/hbm/blocks/BlockCable.java +++ b/com/hbm/blocks/BlockCable.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityCable; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/BlockConverterHeRf.java b/com/hbm/blocks/BlockConverterHeRf.java index 6dce34911..dd15e7dfb 100644 --- a/com/hbm/blocks/BlockConverterHeRf.java +++ b/com/hbm/blocks/BlockConverterHeRf.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityConverterHeRf; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/BlockConverterRfHe.java b/com/hbm/blocks/BlockConverterRfHe.java index 0304e4d9a..514fdd855 100644 --- a/com/hbm/blocks/BlockConverterRfHe.java +++ b/com/hbm/blocks/BlockConverterRfHe.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityConverterRfHe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/BlockCrashedBomb.java b/com/hbm/blocks/BlockCrashedBomb.java index 4879d7ec3..121a1beee 100644 --- a/com/hbm/blocks/BlockCrashedBomb.java +++ b/com/hbm/blocks/BlockCrashedBomb.java @@ -9,6 +9,7 @@ import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityCrashedBomb; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/Crate.java b/com/hbm/blocks/BlockCrate.java similarity index 96% rename from com/hbm/blocks/Crate.java rename to com/hbm/blocks/BlockCrate.java index 696d29794..97418500b 100644 --- a/com/hbm/blocks/Crate.java +++ b/com/hbm/blocks/BlockCrate.java @@ -7,6 +7,7 @@ import java.util.Random; import com.hbm.items.ModItems; import net.minecraft.block.Block; +import net.minecraft.block.BlockFalling; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -16,9 +17,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -public class Crate extends Block { +public class BlockCrate extends BlockFalling { - protected Crate(Material p_i45394_1_) { + protected BlockCrate(Material p_i45394_1_) { super(p_i45394_1_); } @@ -41,7 +42,7 @@ public class Crate extends Block { } } - return false; + return true; } public void dropItems(World world, int x, int y, int z) { @@ -133,6 +134,7 @@ public class Crate extends Block { list.add(ModItems.clip_rpg); list.add(ModItems.clip_revolver_iron); list.add(ModItems.syringe_metal_stimpak); + break; case 20: list.add(ModItems.clip_rpg); list.add(ModItems.clip_revolver); diff --git a/com/hbm/blocks/BombMulti.java b/com/hbm/blocks/BombMulti.java index 45e08895e..bd46d4b4c 100644 --- a/com/hbm/blocks/BombMulti.java +++ b/com/hbm/blocks/BombMulti.java @@ -24,6 +24,7 @@ import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityBombMulti; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/DecoBlock.java b/com/hbm/blocks/DecoBlock.java index 248fde51a..9a67f45c0 100644 --- a/com/hbm/blocks/DecoBlock.java +++ b/com/hbm/blocks/DecoBlock.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityDecoBlock; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/DecoBlockAlt.java b/com/hbm/blocks/DecoBlockAlt.java index a6100dbb7..aba7b87c8 100644 --- a/com/hbm/blocks/DecoBlockAlt.java +++ b/com/hbm/blocks/DecoBlockAlt.java @@ -4,6 +4,10 @@ import java.util.Random; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityDecoBlockAlt; +import com.hbm.tileentity.TileEntityDecoBlockAltF; +import com.hbm.tileentity.TileEntityDecoBlockAltG; +import com.hbm.tileentity.TileEntityDecoBlockAltW; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/DecoPoleSatelliteReceiver.java b/com/hbm/blocks/DecoPoleSatelliteReceiver.java index e77b0e348..5b3790e3d 100644 --- a/com/hbm/blocks/DecoPoleSatelliteReceiver.java +++ b/com/hbm/blocks/DecoPoleSatelliteReceiver.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/DecoPoleTop.java b/com/hbm/blocks/DecoPoleTop.java index 2d587b759..f31fecf97 100644 --- a/com/hbm/blocks/DecoPoleTop.java +++ b/com/hbm/blocks/DecoPoleTop.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityDecoPoleTop; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/DecoSteelPoles.java b/com/hbm/blocks/DecoSteelPoles.java index 4e68a53d0..45f27556f 100644 --- a/com/hbm/blocks/DecoSteelPoles.java +++ b/com/hbm/blocks/DecoSteelPoles.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityDecoSteelPoles; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/DecoTapeRecorder.java b/com/hbm/blocks/DecoTapeRecorder.java index de47d95f0..b45a399fb 100644 --- a/com/hbm/blocks/DecoTapeRecorder.java +++ b/com/hbm/blocks/DecoTapeRecorder.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityDecoTapeRecorder; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/FactoryCoreAdvanced.java b/com/hbm/blocks/FactoryCoreAdvanced.java index 81d13029e..386690b2f 100644 --- a/com/hbm/blocks/FactoryCoreAdvanced.java +++ b/com/hbm/blocks/FactoryCoreAdvanced.java @@ -2,6 +2,8 @@ package com.hbm.blocks; import java.util.Random; +import com.hbm.tileentity.TileEntityCoreAdvanced; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/FactoryCoreTitanium.java b/com/hbm/blocks/FactoryCoreTitanium.java index efd66639a..c66a08a44 100644 --- a/com/hbm/blocks/FactoryCoreTitanium.java +++ b/com/hbm/blocks/FactoryCoreTitanium.java @@ -2,6 +2,8 @@ package com.hbm.blocks; import java.util.Random; +import com.hbm.tileentity.TileEntityCoreTitanium; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/com/hbm/blocks/FactoryHatch.java b/com/hbm/blocks/FactoryHatch.java index f79cd9721..f4e80c00f 100644 --- a/com/hbm/blocks/FactoryHatch.java +++ b/com/hbm/blocks/FactoryHatch.java @@ -4,6 +4,8 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.TileEntityCoreTitanium; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/FusionCore.java b/com/hbm/blocks/FusionCore.java index f338b48cd..854f09ff5 100644 --- a/com/hbm/blocks/FusionCore.java +++ b/com/hbm/blocks/FusionCore.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityFusionMultiblock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/FusionHatch.java b/com/hbm/blocks/FusionHatch.java index 6f8d996a4..dffac4826 100644 --- a/com/hbm/blocks/FusionHatch.java +++ b/com/hbm/blocks/FusionHatch.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityFusionMultiblock; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/LaunchPad.java b/com/hbm/blocks/LaunchPad.java index b4874f58c..5b124ec18 100644 --- a/com/hbm/blocks/LaunchPad.java +++ b/com/hbm/blocks/LaunchPad.java @@ -22,6 +22,7 @@ import com.hbm.entity.EntityMissileStrong; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityLaunchPad; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineBattery.java b/com/hbm/blocks/MachineBattery.java index 7feb70302..0fd5ac106 100644 --- a/com/hbm/blocks/MachineBattery.java +++ b/com/hbm/blocks/MachineBattery.java @@ -4,6 +4,8 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityDiFurnace; +import com.hbm.tileentity.TileEntityMachineBattery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineCMBFactory.java b/com/hbm/blocks/MachineCMBFactory.java new file mode 100644 index 000000000..7f7531112 --- /dev/null +++ b/com/hbm/blocks/MachineCMBFactory.java @@ -0,0 +1,145 @@ +package com.hbm.blocks; + +import java.util.Random; + +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineCMBFactory; +import com.hbm.tileentity.TileEntityMachineDiesel; + +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class MachineCMBFactory extends BlockContainer { + + private final Random field_149933_a = new Random(); + private Random rand; + private static boolean keepInventory; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + private IIcon iconTop; + private IIcon iconSide; + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_bottom"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_top"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_side"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_diesel_front"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) { + if(side == 0) + return iconBottom; + if(side == 1) + return iconTop; + if(side == 2 || side == 3) + return blockIcon; + if(side == 4 || side == 5) + return iconSide; + + return null; + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + { + return Item.getItemFromBlock(ModBlocks.machine_combine_factory); + } + + protected MachineCMBFactory(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityMachineCMBFactory(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntityMachineCMBFactory entity = (TileEntityMachineCMBFactory) world.getTileEntity(x, y, z); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_combine_factory, world, x, y, z); + } + return true; + } else { + return false; + } + } + + @Override + public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_) + { + if (!keepInventory) + { + TileEntityMachineCMBFactory tileentityfurnace = (TileEntityMachineCMBFactory)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_); + + if (tileentityfurnace != null) + { + for (int i1 = 0; i1 < tileentityfurnace.getSizeInventory(); ++i1) + { + ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); + + if (itemstack != null) + { + float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + + while (itemstack.stackSize > 0) + { + int j1 = this.field_149933_a.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) + { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } + + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } +} diff --git a/com/hbm/blocks/MachineCentrifuge.java b/com/hbm/blocks/MachineCentrifuge.java index 2b28a8da0..22d4341c5 100644 --- a/com/hbm/blocks/MachineCentrifuge.java +++ b/com/hbm/blocks/MachineCentrifuge.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineCentrifuge; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineCoal.java b/com/hbm/blocks/MachineCoal.java index 4bb3d4088..2521526c8 100644 --- a/com/hbm/blocks/MachineCoal.java +++ b/com/hbm/blocks/MachineCoal.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineCoal; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineDeuterium.java b/com/hbm/blocks/MachineDeuterium.java index 0514abc3d..5cb56a0a5 100644 --- a/com/hbm/blocks/MachineDeuterium.java +++ b/com/hbm/blocks/MachineDeuterium.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineDeuterium; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineDiFurnace.java b/com/hbm/blocks/MachineDiFurnace.java index 162ba2d7f..8ea8cd44f 100644 --- a/com/hbm/blocks/MachineDiFurnace.java +++ b/com/hbm/blocks/MachineDiFurnace.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityDiFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineDiesel.java b/com/hbm/blocks/MachineDiesel.java index 5f50693ad..c7848f935 100644 --- a/com/hbm/blocks/MachineDiesel.java +++ b/com/hbm/blocks/MachineDiesel.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineDiesel; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineElectricFurnace.java b/com/hbm/blocks/MachineElectricFurnace.java index 1c3be36d3..6e1c385e6 100644 --- a/com/hbm/blocks/MachineElectricFurnace.java +++ b/com/hbm/blocks/MachineElectricFurnace.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineElectricFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineGenerator.java b/com/hbm/blocks/MachineGenerator.java index 229b65e3e..e0e88b4f7 100644 --- a/com/hbm/blocks/MachineGenerator.java +++ b/com/hbm/blocks/MachineGenerator.java @@ -5,6 +5,7 @@ import java.util.Random; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineGenerator; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineNukeFurnace.java b/com/hbm/blocks/MachineNukeFurnace.java index 0f2300d81..638e85d47 100644 --- a/com/hbm/blocks/MachineNukeFurnace.java +++ b/com/hbm/blocks/MachineNukeFurnace.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachinePuF6Tank.java b/com/hbm/blocks/MachinePuF6Tank.java index 677fcea31..7dc1c813a 100644 --- a/com/hbm/blocks/MachinePuF6Tank.java +++ b/com/hbm/blocks/MachinePuF6Tank.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachinePuF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineReactor.java b/com/hbm/blocks/MachineReactor.java index 11c841f94..ca65b80c6 100644 --- a/com/hbm/blocks/MachineReactor.java +++ b/com/hbm/blocks/MachineReactor.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineReactor; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineRtgFurnace.java b/com/hbm/blocks/MachineRtgFurnace.java index 84c160833..e0fd9ce12 100644 --- a/com/hbm/blocks/MachineRtgFurnace.java +++ b/com/hbm/blocks/MachineRtgFurnace.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityRtgFurnace; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineSchrabidiumTransmutator.java b/com/hbm/blocks/MachineSchrabidiumTransmutator.java index 33843808b..dc80df786 100644 --- a/com/hbm/blocks/MachineSchrabidiumTransmutator.java +++ b/com/hbm/blocks/MachineSchrabidiumTransmutator.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/MachineShredder.java b/com/hbm/blocks/MachineShredder.java index 7e5a98b75..31de8f43c 100644 --- a/com/hbm/blocks/MachineShredder.java +++ b/com/hbm/blocks/MachineShredder.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineShredder; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; @@ -35,10 +36,10 @@ public class MachineShredder extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom"); - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top"); - this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_bottom_alt"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_top_alt"); + this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_side_alt"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_shredder_front_alt"); } @Override diff --git a/com/hbm/blocks/MachineUF6Tank.java b/com/hbm/blocks/MachineUF6Tank.java index a4e0dfb14..9683e8a3e 100644 --- a/com/hbm/blocks/MachineUF6Tank.java +++ b/com/hbm/blocks/MachineUF6Tank.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachineUF6Tank; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index ea9a81e50..6de6919a0 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -249,6 +249,9 @@ public class ModBlocks { public static Block machine_shredder; public static final int guiID_machine_shredder = 34; + public static Block machine_combine_factory; + public static final int guiID_combine_factory = 35; + public static Block launch_pad; public static Block launch_pad_generic; public static Block launch_pad_incendiary; @@ -419,6 +422,8 @@ public class ModBlocks { machine_shredder = new MachineShredder(Material.iron).setBlockName("machine_shredder").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock); + machine_combine_factory = new MachineCMBFactory(Material.iron).setBlockName("machine_combine_factory").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock); + red_wire_coated = new WireCoated(Material.iron).setBlockName("red_wire_coated").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":red_wire_coated"); red_cable = new BlockCable(Material.iron).setBlockName("red_cable").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":red_cable_icon"); @@ -485,7 +490,7 @@ public class ModBlocks { book_guide = new Guide(Material.iron).setBlockName("book_guide").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke); - crate = new Crate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); + crate = new BlockCrate(Material.iron).setBlockName("crate").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.tabNuke).setBlockTextureName(RefStrings.MODID + ":crate"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock); diff --git a/com/hbm/blocks/NukeBoy.java b/com/hbm/blocks/NukeBoy.java index 20fbcca0c..54122797f 100644 --- a/com/hbm/blocks/NukeBoy.java +++ b/com/hbm/blocks/NukeBoy.java @@ -6,6 +6,7 @@ import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeBoy; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/NukeFleija.java b/com/hbm/blocks/NukeFleija.java index b7013c9a1..a2b3de5bd 100644 --- a/com/hbm/blocks/NukeFleija.java +++ b/com/hbm/blocks/NukeFleija.java @@ -4,9 +4,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import com.hbm.entity.EntityCloudFleija; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeFleija; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; @@ -149,6 +151,12 @@ public class NukeFleija extends BlockContainer implements IBomb { entity.waste = false; world.spawnEntityInWorld(entity); + + EntityCloudFleija cloud = new EntityCloudFleija(world, r); + cloud.posX = x; + cloud.posY = y; + cloud.posZ = z; + world.spawnEntityInWorld(cloud); } return false; diff --git a/com/hbm/blocks/NukeGadget.java b/com/hbm/blocks/NukeGadget.java index fe5f6ada3..004676b69 100644 --- a/com/hbm/blocks/NukeGadget.java +++ b/com/hbm/blocks/NukeGadget.java @@ -8,6 +8,7 @@ import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeGadget; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/NukeMan.java b/com/hbm/blocks/NukeMan.java index d12367234..d387bfd92 100644 --- a/com/hbm/blocks/NukeMan.java +++ b/com/hbm/blocks/NukeMan.java @@ -8,6 +8,7 @@ import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeMan; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/NukeMike.java b/com/hbm/blocks/NukeMike.java index c7bf3d360..b3a748246 100644 --- a/com/hbm/blocks/NukeMike.java +++ b/com/hbm/blocks/NukeMike.java @@ -9,6 +9,7 @@ import com.hbm.entity.EntityNukeCloudSmall; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeMike; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/NukePrototype.java b/com/hbm/blocks/NukePrototype.java index 33a09120e..0ae030492 100644 --- a/com/hbm/blocks/NukePrototype.java +++ b/com/hbm/blocks/NukePrototype.java @@ -4,10 +4,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; +import com.hbm.entity.EntityCloudFleija; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukePrototype; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; @@ -160,6 +162,12 @@ public class NukePrototype extends BlockContainer implements IBomb { entity.waste = false; world.spawnEntityInWorld(entity); + + EntityCloudFleija cloud = new EntityCloudFleija(world, r); + cloud.posX = x; + cloud.posY = y; + cloud.posZ = z; + world.spawnEntityInWorld(cloud); } return false; diff --git a/com/hbm/blocks/NukeTsar.java b/com/hbm/blocks/NukeTsar.java index a66706ab0..65b34550c 100644 --- a/com/hbm/blocks/NukeTsar.java +++ b/com/hbm/blocks/NukeTsar.java @@ -7,6 +7,7 @@ import java.util.Random; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityNukeTsar; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/ReactorCore.java b/com/hbm/blocks/ReactorCore.java index a9d96c565..fa0028b06 100644 --- a/com/hbm/blocks/ReactorCore.java +++ b/com/hbm/blocks/ReactorCore.java @@ -3,6 +3,7 @@ package com.hbm.blocks; import java.util.Random; import com.hbm.explosion.ExplosionNukeGeneric; +import com.hbm.tileentity.TileEntityReactorMultiblock; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/ReactorHatch.java b/com/hbm/blocks/ReactorHatch.java index afb80d657..20f9b3cd5 100644 --- a/com/hbm/blocks/ReactorHatch.java +++ b/com/hbm/blocks/ReactorHatch.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityReactorMultiblock; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/RedBarrel.java b/com/hbm/blocks/RedBarrel.java index c4b6e1207..b8f42213e 100644 --- a/com/hbm/blocks/RedBarrel.java +++ b/com/hbm/blocks/RedBarrel.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityRedBarrel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/TestBombAdvanced.java b/com/hbm/blocks/TestBombAdvanced.java index 340846ca0..65b016100 100644 --- a/com/hbm/blocks/TestBombAdvanced.java +++ b/com/hbm/blocks/TestBombAdvanced.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityTestBombAdvanced; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/TestContainer.java b/com/hbm/blocks/TestContainer.java index 22334953f..7ac1a4885 100644 --- a/com/hbm/blocks/TestContainer.java +++ b/com/hbm/blocks/TestContainer.java @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.Random; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityTestContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/TestMissile.java b/com/hbm/blocks/TestMissile.java index c74643241..31e6dfe5b 100644 --- a/com/hbm/blocks/TestMissile.java +++ b/com/hbm/blocks/TestMissile.java @@ -1,6 +1,8 @@ package com.hbm.blocks; import com.hbm.entity.EntityTestMissile; +import com.hbm.tileentity.TileEntityTestNuke; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/com/hbm/blocks/TestNuke.java b/com/hbm/blocks/TestNuke.java index 8f858e415..a5e4e5b78 100644 --- a/com/hbm/blocks/TestNuke.java +++ b/com/hbm/blocks/TestNuke.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Random; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityTestNuke; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; diff --git a/com/hbm/blocks/TestObjTester.java b/com/hbm/blocks/TestObjTester.java index c59fb3370..73d424812 100644 --- a/com/hbm/blocks/TestObjTester.java +++ b/com/hbm/blocks/TestObjTester.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityObjTester; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/TestRender.java b/com/hbm/blocks/TestRender.java index 089c966fc..a638dbb7c 100644 --- a/com/hbm/blocks/TestRender.java +++ b/com/hbm/blocks/TestRender.java @@ -1,6 +1,8 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityTestRender; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/TestRotationTester.java b/com/hbm/blocks/TestRotationTester.java index d21076aad..c7b093b98 100644 --- a/com/hbm/blocks/TestRotationTester.java +++ b/com/hbm/blocks/TestRotationTester.java @@ -1,6 +1,7 @@ package com.hbm.blocks; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityRotationTester; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/WatzCore.java b/com/hbm/blocks/WatzCore.java index abcdc8a63..0c26b17bd 100644 --- a/com/hbm/blocks/WatzCore.java +++ b/com/hbm/blocks/WatzCore.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityWatzCore; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/WatzHatch.java b/com/hbm/blocks/WatzHatch.java index c12eb66fc..bbf68549f 100644 --- a/com/hbm/blocks/WatzHatch.java +++ b/com/hbm/blocks/WatzHatch.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityWatzCore; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; diff --git a/com/hbm/blocks/WireCoated.java b/com/hbm/blocks/WireCoated.java index e31a6e102..8833881a8 100644 --- a/com/hbm/blocks/WireCoated.java +++ b/com/hbm/blocks/WireCoated.java @@ -1,5 +1,7 @@ package com.hbm.blocks; +import com.hbm.tileentity.TileEntityWireCoated; + import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/YellowBarrel.java b/com/hbm/blocks/YellowBarrel.java index 623460634..d9eaf6f0e 100644 --- a/com/hbm/blocks/YellowBarrel.java +++ b/com/hbm/blocks/YellowBarrel.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityYellowBarrel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/entity/EntityBullet.java b/com/hbm/entity/EntityBullet.java index 1e81d8f9f..7e4312a87 100644 --- a/com/hbm/entity/EntityBullet.java +++ b/com/hbm/entity/EntityBullet.java @@ -9,13 +9,19 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.item.EntityItemFrame; +import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.entity.passive.EntityMooshroom; +import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; @@ -27,6 +33,7 @@ import com.hbm.blocks.DecoBlockAlt; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.RedBarrel; import com.hbm.items.ModItems; +import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -56,6 +63,7 @@ public class EntityBullet extends Entity implements IProjectile { private int dmgMax = 1; private boolean isTau = false; private boolean instakill = false; + private boolean rad = false; public EntityBullet(World p_i1753_1_) { super(p_i1753_1_); @@ -100,7 +108,7 @@ public class EntityBullet extends Entity implements IProjectile { } public EntityBullet(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, - boolean instakill) { + boolean instakill, boolean rad) { super(p_i1756_1_); this.renderDistanceWeight = 10.0D; this.shootingEntity = p_i1756_2_; @@ -127,6 +135,7 @@ public class EntityBullet extends Entity implements IProjectile { // this.dmgMin = dmgMin; // this.dmgMax = dmgMax; this.instakill = instakill; + this.rad = rad; } public EntityBullet(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, @@ -428,6 +437,34 @@ public class EntityBullet extends Entity implements IProjectile { if (movingobjectposition.entityHit instanceof EntityLivingBase) { EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.entityHit; + if (rad) { + if (entitylivingbase instanceof EntityPlayer + && Library.checkForHazmat((EntityPlayer) entitylivingbase)) { + } else if (entitylivingbase instanceof EntityCreeper) { + EntityNuclearCreeper creep = new EntityNuclearCreeper(this.worldObj); + creep.setLocationAndAngles(entitylivingbase.posX, entitylivingbase.posY, entitylivingbase.posZ, + entitylivingbase.rotationYaw, entitylivingbase.rotationPitch); + if (!entitylivingbase.isDead) + if (!worldObj.isRemote) + worldObj.spawnEntityInWorld(creep); + entitylivingbase.setDead(); + } else if (entitylivingbase instanceof EntityVillager) { + EntityZombie creep = new EntityZombie(this.worldObj); + creep.setLocationAndAngles(entitylivingbase.posX, entitylivingbase.posY, entitylivingbase.posZ, + entitylivingbase.rotationYaw, entitylivingbase.rotationPitch); + entitylivingbase.setDead(); + if (!this.worldObj.isRemote) + this.worldObj.spawnEntityInWorld(creep); + } else if (entitylivingbase instanceof EntityLivingBase + && !(entitylivingbase instanceof EntityNuclearCreeper) + && !(entitylivingbase instanceof EntityMooshroom) + && !(entitylivingbase instanceof EntityZombie)) { + entitylivingbase.addPotionEffect(new PotionEffect(Potion.poison.getId(), 2 * 60 * 20, 2)); + entitylivingbase.addPotionEffect(new PotionEffect(Potion.wither.getId(), 20, 4)); + entitylivingbase.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 1 * 60 * 20, 1)); + } + } + if (this.knockbackStrength > 0) { f4 = MathHelper .sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); diff --git a/com/hbm/entity/EntityCloudFleija.java b/com/hbm/entity/EntityCloudFleija.java new file mode 100644 index 000000000..f15ad51de --- /dev/null +++ b/com/hbm/entity/EntityCloudFleija.java @@ -0,0 +1,84 @@ +package com.hbm.entity; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.Entity; +import net.minecraft.entity.effect.EntityLightningBolt; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +public class EntityCloudFleija extends Entity { + + public int maxAge = 100; + public int age; + public float scale = 0; + + public EntityCloudFleija(World p_i1582_1_) { + super(p_i1582_1_); + this.setSize(1, 4); + this.ignoreFrustumCheck = true; + this.isImmuneToFire = true; + this.age = 0; + scale = 0; + } + + @Override + protected void entityInit() { + this.dataWatcher.addObject(16, Integer.valueOf((int) 0)); + } + + @Override + @SideOnly(Side.CLIENT) + public int getBrightnessForRender(float p_70070_1_) + { + return 15728880; + } + + @Override + public float getBrightness(float p_70013_1_) + { + return 1.0F; + } + + public EntityCloudFleija(World p_i1582_1_, int maxAge) { + super(p_i1582_1_); + this.setSize(20, 40); + this.isImmuneToFire = true; + this.setMaxAge(maxAge); + } + + @Override + public void onUpdate() { + this.age++; + this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY + 200, this.posZ)); + + if(this.age >= this.getMaxAge()) + { + this.age = 0; + this.setDead(); + } + + this.scale++; + } + + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { + age = p_70037_1_.getShort("age"); + scale = p_70037_1_.getShort("scale"); + } + + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { + p_70014_1_.setShort("age", (short)age); + p_70014_1_.setShort("scale", (short)scale); + + } + + public void setMaxAge(int i) { + this.dataWatcher.updateObject(16, Integer.valueOf(i)); + } + + public int getMaxAge() { + return this.dataWatcher.getWatchableObjectInt(16); + } +} diff --git a/com/hbm/entity/EntityGrenadeMk2.java b/com/hbm/entity/EntityGrenadeMk2.java new file mode 100644 index 000000000..e58264345 --- /dev/null +++ b/com/hbm/entity/EntityGrenadeMk2.java @@ -0,0 +1,52 @@ +package com.hbm.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntityBlaze; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +public class EntityGrenadeMk2 extends EntityThrowable { + + private static final String __OBFID = "CL_00001722"; + + public EntityGrenadeMk2(World p_i1773_1_) + { + super(p_i1773_1_); + } + + public EntityGrenadeMk2(World p_i1774_1_, EntityLivingBase p_i1774_2_) + { + super(p_i1774_1_, p_i1774_2_); + } + + public EntityGrenadeMk2(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) + { + super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); + } + + @Override + protected void onImpact(MovingObjectPosition p_70184_1_) + { + if (p_70184_1_.entityHit != null) + { + byte b0 = 0; + + if (p_70184_1_.entityHit instanceof EntityBlaze) + { + b0 = 3; + } + + p_70184_1_.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0); + } + + if (!this.worldObj.isRemote) + { + this.setDead(); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 7.5F, true); + } + } +} diff --git a/com/hbm/entity/EntityNukeExplosionAdvanced.java b/com/hbm/entity/EntityNukeExplosionAdvanced.java index 2609b3fe5..12031d144 100644 --- a/com/hbm/entity/EntityNukeExplosionAdvanced.java +++ b/com/hbm/entity/EntityNukeExplosionAdvanced.java @@ -50,6 +50,8 @@ public class EntityNukeExplosionAdvanced extends Entity { this.did = true; } + speed = 160; + boolean flag = false; boolean flag2 = false; boolean flag3 = false; @@ -95,46 +97,5 @@ public class EntityNukeExplosionAdvanced extends Entity { protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { } - - private void removeEntities(World world, int x, int y, int z) { - float f = 10; - HashSet hashset = new HashSet(); - int i; - int j; - int k; - double d5; - double d6; - double d7; - boolean isOccupied = false; - - i = MathHelper.floor_double(x - f - 1.0D); - j = MathHelper.floor_double(x + f + 1.0D); - k = MathHelper.floor_double(y - f - 1.0D); - int i2 = MathHelper.floor_double(y + f + 1.0D); - int l = MathHelper.floor_double(z - f - 1.0D); - int j2 = MathHelper.floor_double(z + f + 1.0D); - List list = world.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(i, k, l, j, i2, j2)); - Vec3 vec3 = Vec3.createVectorHelper(x, y, z); - - for (int i1 = 0; i1 < list.size(); ++i1) - { - Entity entity = (Entity)list.get(i1); - double d4 = entity.getDistance(x, y, z) / f; - - if (d4 <= 1.0D) - { - d5 = entity.posX - x; - d6 = entity.posY + entity.getEyeHeight() - y; - d7 = entity.posZ - z; - double d9 = MathHelper.sqrt_double(d5 * d5 + d6 * d6 + d7 * d7); - if (d9 < f && (entity instanceof EntityNukeCloudSmall)) - { - { - entity.setDead(); - } - } - } - } - } } \ No newline at end of file diff --git a/com/hbm/entity/EntityRainbow.java b/com/hbm/entity/EntityRainbow.java index 2302ca1f9..f95c1bf6f 100644 --- a/com/hbm/entity/EntityRainbow.java +++ b/com/hbm/entity/EntityRainbow.java @@ -224,7 +224,7 @@ public class EntityRainbow extends Entity implements IProjectile block.setBlockBoundsBasedOnState(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); AxisAlignedBB axisalignedbb = block.getCollisionBoundingBoxFromPool(this.worldObj, this.field_145791_d, this.field_145792_e, this.field_145789_f); if(!worldObj.isRemote) - ExplosionChaos.explode(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); + ExplosionChaos.explodeZOMG(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); } if (this.arrowShake > 0) @@ -359,7 +359,7 @@ public class EntityRainbow extends Entity implements IProjectile { movingobjectposition.entityHit.attackEntityFrom(damagesource, 100000F); if(!worldObj.isRemote) - ExplosionChaos.explode(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); + ExplosionChaos.explodeZOMG(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); } } } diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java index 9776d5641..aa9156824 100644 --- a/com/hbm/explosion/ExplosionChaos.java +++ b/com/hbm/explosion/ExplosionChaos.java @@ -62,6 +62,33 @@ public class ExplosionChaos { } } + public static void explodeZOMG(World world, int x, int y, int z, int bombStartStrength) { + + int r = bombStartStrength; + int r2 = r*r; + int r22 = r2/2; + for (int xx = -r; xx < r; xx++) + { + int X = xx+x; + int XX = xx*xx; + for (int yy = -r; yy < r; yy++) + { + int Y = yy+y; + int YY = XX+yy*yy; + for (int zz = -r; zz < r; zz++) + { + int Z = zz+z; + int ZZ = YY+zz*zz; + if (ZZ 3 && s.substring(0, 3).equals("gem")) { + ItemStack stack = canFindDustByName(s.substring(3)); + if (stack != null) { + setRecipe(theWholeThing.get(i).item, new ItemStack(stack.getItem(), 1)); + } else { + setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.scrap)); + } } else if (s.length() > 4 && s.substring(0, 4).equals("dust")) { setRecipe(theWholeThing.get(i).item, new ItemStack(ModItems.dust)); } else { @@ -651,6 +658,7 @@ public class MachineRecipes { inp.getItem() != null && outp != null && recipes.get(i).input.getItem().equals(inp.getItem())) + //TODO: check if i didn't break anything recipes.get(i).output = outp; } } diff --git a/com/hbm/interfaces/IBomb.java b/com/hbm/interfaces/IBomb.java index 3234b264a..5dcedcf31 100644 --- a/com/hbm/interfaces/IBomb.java +++ b/com/hbm/interfaces/IBomb.java @@ -5,5 +5,10 @@ import net.minecraft.world.World; public interface IBomb { /////////////people + + + //Months later I found this joke again + //I'm not even sorry + void explode(World world, int x, int y, int z); } diff --git a/com/hbm/items/GunRevolver.java b/com/hbm/items/GunRevolver.java index 569a47f47..faa64ae78 100644 --- a/com/hbm/items/GunRevolver.java +++ b/com/hbm/items/GunRevolver.java @@ -32,9 +32,10 @@ public class GunRevolver extends Item private int dmgMin; private int dmgMax; private boolean instakill = false; + private boolean rad = false; Random rand = new Random(); - public GunRevolver(Item ammo, int dmgMin, int dmgMax, boolean instakill) + public GunRevolver(Item ammo, int dmgMin, int dmgMax, boolean instakill, boolean rad) { this.maxStackSize = 1; if(this == ModItems.gun_revolver_iron) @@ -49,6 +50,10 @@ public class GunRevolver extends Item { this.setMaxDamage(1000); } + if(this == ModItems.gun_revolver_lead) + { + this.setMaxDamage(250); + } if(this == ModItems.gun_revolver_schrabidium) { this.setMaxDamage(100000); @@ -62,6 +67,7 @@ public class GunRevolver extends Item this.dmgMin = dmgMin; this.dmgMax = dmgMax; this.instakill = instakill; + this.rad = rad; } @Override @@ -110,11 +116,11 @@ public class GunRevolver extends Item f = 10.0F; } - EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill); + EntityBullet entityarrow = new EntityBullet(p_77615_2_, p_77615_3_, 3.0F, dmgMin, dmgMax, instakill, rad); entityarrow.setDamage(dmgMin + rand.nextInt(dmgMax - dmgMin)); p_77615_1_.damageItem(1, p_77615_3_); - if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_schrabidium) + if(this == ModItems.gun_revolver || this == ModItems.gun_revolver_iron || this == ModItems.gun_revolver_gold || this == ModItems.gun_revolver_lead || this == ModItems.gun_revolver_schrabidium) { p_77615_2_.playSoundAtEntity(p_77615_3_, "random.explode", 1.0F, 3.0F); } diff --git a/com/hbm/items/GunZOMG.java b/com/hbm/items/GunZOMG.java index e0a79511f..99e263624 100644 --- a/com/hbm/items/GunZOMG.java +++ b/com/hbm/items/GunZOMG.java @@ -147,9 +147,13 @@ public class GunZOMG extends Item { EntityRainbow entityarrow = new EntityRainbow(world, player, 1F); EntityRainbow entityarrow1 = new EntityRainbow(world, player, 1F); EntityRainbow entityarrow2 = new EntityRainbow(world, player, 1F); - entityarrow.setDamage(35 + rand.nextInt(45 - 35)); - entityarrow1.setDamage(35 + rand.nextInt(45 - 35)); - entityarrow2.setDamage(35 + rand.nextInt(45 - 35)); + EntityRainbow entityarrow3 = new EntityRainbow(world, player, 1F); + EntityRainbow entityarrow4 = new EntityRainbow(world, player, 1F); + entityarrow.setDamage(10000 + rand.nextInt(90000)); + entityarrow1.setDamage(10000 + rand.nextInt(90000)); + entityarrow2.setDamage(10000 + rand.nextInt(90000)); + entityarrow3.setDamage(10000 + rand.nextInt(90000)); + entityarrow4.setDamage(10000 + rand.nextInt(90000)); //world.playSoundAtEntity(player, "random.explode", 1.0F, 1.5F + (rand.nextFloat() / 4)); world.playSoundAtEntity(player, "ambient.weather.thunder", 1.0F, 2); @@ -158,6 +162,8 @@ public class GunZOMG extends Item { world.spawnEntityInWorld(entityarrow); world.spawnEntityInWorld(entityarrow1); world.spawnEntityInWorld(entityarrow2); + world.spawnEntityInWorld(entityarrow3); + world.spawnEntityInWorld(entityarrow4); } } } else { diff --git a/com/hbm/items/ItemCrateCaller.java b/com/hbm/items/ItemCrateCaller.java new file mode 100644 index 000000000..87fc1353c --- /dev/null +++ b/com/hbm/items/ItemCrateCaller.java @@ -0,0 +1,56 @@ +package com.hbm.items; + +import java.util.List; +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IBomb; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; + +public class ItemCrateCaller extends Item { + + Random rand = new Random(); + + public ItemCrateCaller() { + this.canRepair = false; + this.setMaxDamage(4); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) + { + list.add("Right click to request supply drop!"); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + + stack.damageItem(1, player); + + int x = rand.nextInt(31) - 15; + int z = rand.nextInt(31) - 15; + + if(!world.isRemote) + { + if(world.getBlock((int)player.posX + x, 255, (int)player.posZ + z) == Blocks.air) + world.setBlock((int)player.posX + x, 255, (int)player.posZ + z, ModBlocks.crate); + } + if(world.isRemote) + { + player.addChatMessage(new ChatComponentText("Called in supply drop!")); + } + + player.swingItem(); + + return stack; + + } + +} diff --git a/com/hbm/items/ItemCustomLore.java b/com/hbm/items/ItemCustomLore.java index a194398f3..4a1ac9fbb 100644 --- a/com/hbm/items/ItemCustomLore.java +++ b/com/hbm/items/ItemCustomLore.java @@ -325,6 +325,27 @@ public class ItemCustomLore extends Item { { list.add("I hate dust!"); } + + if(this == ModItems.ingot_combine_steel) + { + list.add("\"I mean, it's a verb for crying out loud."); + list.add("The aliens aren't verbs. They're nouns!\""); + list.add("\"Actually, I think it's also the name"); + list.add("of some kind of farm equipment, like a"); + list.add("thresher or something.\""); + list.add("\"That's even worse. Now we have a word"); + list.add("that could mean 'to mix things together',"); + list.add("a piece of farm equipment, and let's see..."); + list.add("oh yea, it can also mean 'the most advanced"); + list.add("form of life in the known universe'.\""); + list.add("\"So?\""); + list.add("\"'So?' C'mon man, they're ALIENS!\""); + } + + if(this == ModItems.gun_super_shotgun) + { + list.add("It's super broken!"); + } } @Override diff --git a/com/hbm/items/ItemDesingator.java b/com/hbm/items/ItemDesingator.java index b82612914..ff693d5b5 100644 --- a/com/hbm/items/ItemDesingator.java +++ b/com/hbm/items/ItemDesingator.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemDesingator extends Item { @@ -46,6 +47,10 @@ public class ItemDesingator extends Item { p_77648_1_.stackTagCompound.setInteger("xCoord", p_77648_4_); p_77648_1_.stackTagCompound.setInteger("zCoord", p_77648_6_); } + if(p_77648_3_.isRemote) + { + p_77648_2_.addChatMessage(new ChatComponentText("Position set!")); + } return true; } diff --git a/com/hbm/items/ItemDrop.java b/com/hbm/items/ItemDrop.java index d4feca834..2156d6ac6 100644 --- a/com/hbm/items/ItemDrop.java +++ b/com/hbm/items/ItemDrop.java @@ -2,7 +2,9 @@ package com.hbm.items; import java.util.List; +import com.hbm.entity.EntityCloudFleija; import com.hbm.entity.EntityNukeExplosionAdvanced; +import com.hbm.explosion.ExplosionChaos; import com.hbm.main.MainRegistry; import net.minecraft.entity.item.EntityItem; @@ -27,7 +29,7 @@ public class ItemDrop extends Item { if (stack.getItem() != null && stack.getItem() == ModItems.cell_anti_schrabidium) { if (!entityItem.worldObj.isRemote) { entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 1.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); + "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); entity.posX = entityItem.posX; @@ -39,12 +41,18 @@ public class ItemDrop extends Item { entity.waste = false; entityItem.worldObj.spawnEntityInWorld(entity); + + EntityCloudFleija cloud = new EntityCloudFleija(entityItem.worldObj, MainRegistry.aSchrabRadius); + cloud.posX = entityItem.posX; + cloud.posY = entityItem.posY; + cloud.posZ = entityItem.posZ; + entityItem.worldObj.spawnEntityInWorld(cloud); } } if (stack.getItem() != null && stack.getItem() == ModItems.singularity) { if (!entityItem.worldObj.isRemote) { entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 1.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); + "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); entity.posX = entityItem.posX; @@ -62,7 +70,7 @@ public class ItemDrop extends Item { if (stack.getItem() != null && stack.getItem() == ModItems.singularity_counter_resonant) { if (!entityItem.worldObj.isRemote) { entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, - "random.explode", 1.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); + "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); entity.posX = entityItem.posX; @@ -77,6 +85,48 @@ public class ItemDrop extends Item { entityItem.worldObj.spawnEntityInWorld(entity); } } + if (stack.getItem() != null && stack.getItem() == ModItems.singularity_super_heated) { + if (!entityItem.worldObj.isRemote) { + entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, + "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); + + EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); + entity.posX = entityItem.posX; + entity.posY = entityItem.posY; + entity.posZ = entityItem.posZ; + entity.destructionRange = MainRegistry.aSchrabRadius * 2; + entity.speed = 25; + entity.coefficient = 0.01F; + entity.coefficient2 = 0.01F; + entity.waste = false; + + entityItem.worldObj.spawnEntityInWorld(entity); + } + } + if (stack.getItem() != null && stack.getItem() == ModItems.black_hole) { + if (!entityItem.worldObj.isRemote) { + entityItem.worldObj.playSoundEffect(entityItem.posX, entityItem.posY, entityItem.posZ, + "random.explode", 100.0f, entityItem.worldObj.rand.nextFloat() * 0.1F + 0.9F); + + EntityNukeExplosionAdvanced entity = new EntityNukeExplosionAdvanced(entityItem.worldObj); + entity.posX = entityItem.posX; + entity.posY = entityItem.posY; + entity.posZ = entityItem.posZ; + entity.destructionRange = MainRegistry.aSchrabRadius * 3; + entity.speed = 25; + entity.coefficient = 0.01F; + entity.coefficient2 = 0.01F; + entity.waste = false; + + entityItem.worldObj.spawnEntityInWorld(entity); + } + } + if (stack.getItem() != null && stack.getItem() == ModItems.crystal_xen) { + if (!entityItem.worldObj.isRemote) { + ExplosionChaos.floater(entityItem.worldObj, (int)entityItem.posX, (int)entityItem.posY, (int)entityItem.posZ, 25, 75); + ExplosionChaos.move(entityItem.worldObj, (int)entityItem.posX, (int)entityItem.posY, (int)entityItem.posZ, 25, 0, 75, 0); + } + } entityItem.setDead(); return true; @@ -106,8 +156,23 @@ public class ItemDrop extends Item { if (itemstack.getItem() != null && itemstack.getItem() == ModItems.singularity_counter_resonant) { list.add("Nullifies resonance of objects in"); list.add("non-euclidean space, creates variable"); - list.add("gravity well. Spontaneously creates"); - list.add("tesseracts."); + list.add("gravity well. Spontaneously spawns"); + list.add("tesseracts. If a tesseract happens to"); + list.add("appear near you, do not directly look"); + list.add("at it."); + } + if (itemstack.getItem() != null && itemstack.getItem() == ModItems.singularity_super_heated) { + list.add("Continuously heats up matter by"); + list.add("resonating every planck second."); + list.add("Tends to catch fire or to create"); + list.add("small plamsa arcs. Not edible."); + } + if (itemstack.getItem() != null && itemstack.getItem() == ModItems.black_hole) { + list.add("Contains a regular singularity"); + list.add("in the center. Too small to"); + list.add("stac stable. It's not the end"); + list.add("of the world as we know it,"); + list.add("and I don't feel fine."); } } diff --git a/com/hbm/items/ItemGrenade.java b/com/hbm/items/ItemGrenade.java index 2f7c70211..3376ebb12 100644 --- a/com/hbm/items/ItemGrenade.java +++ b/com/hbm/items/ItemGrenade.java @@ -8,6 +8,7 @@ import com.hbm.entity.EntityGrenadeFrag; import com.hbm.entity.EntityGrenadeGas; import com.hbm.entity.EntityGrenadeGeneric; import com.hbm.entity.EntityGrenadeLemon; +import com.hbm.entity.EntityGrenadeMk2; import com.hbm.entity.EntityGrenadeNuclear; import com.hbm.entity.EntityGrenadeNuke; import com.hbm.entity.EntityGrenadePlasma; @@ -86,6 +87,9 @@ public class ItemGrenade extends Item { if (this == ModItems.grenade_lemon) { p_77659_2_.spawnEntityInWorld(new EntityGrenadeLemon(p_77659_2_, p_77659_3_)); } + if (this == ModItems.grenade_mk2) { + p_77659_2_.spawnEntityInWorld(new EntityGrenadeMk2(p_77659_2_, p_77659_3_)); + } } return p_77659_1_; diff --git a/com/hbm/items/ItemNugget.java b/com/hbm/items/ItemNugget.java new file mode 100644 index 000000000..a5bf8d0b3 --- /dev/null +++ b/com/hbm/items/ItemNugget.java @@ -0,0 +1,24 @@ +package com.hbm.items; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; + +public class ItemNugget extends ItemFood { + + public ItemNugget(int p_i45340_1_, boolean p_i45340_2_) { + super(p_i45340_1_, p_i45340_2_); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + + if (this == ModItems.gun_moist_nugget) { + list.add("A Moisn-Na...no wait, it's"); + list.add("just a moist nugget."); + } + } + +} diff --git a/com/hbm/items/ItemWandD.java b/com/hbm/items/ItemWandD.java index afa7872f3..bd338fe8f 100644 --- a/com/hbm/items/ItemWandD.java +++ b/com/hbm/items/ItemWandD.java @@ -1,5 +1,7 @@ package com.hbm.items; +import java.util.List; + import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; @@ -18,20 +20,23 @@ public class ItemWandD extends Item { { Block b = world.getBlock(x, y, z); - if(b == ModBlocks.ore_aluminium) - MainRegistry.x++; - if(b == ModBlocks.block_aluminium) - MainRegistry.x--; - if(b == ModBlocks.ore_beryllium) - MainRegistry.y++; - if(b == ModBlocks.block_beryllium) - MainRegistry.y--; - if(b == ModBlocks.ore_copper) - MainRegistry.z++; - if(b == ModBlocks.block_copper) - MainRegistry.z--; + if(!world.isRemote) + { + if (b == ModBlocks.ore_aluminium) + MainRegistry.x++; + if (b == ModBlocks.block_aluminium) + MainRegistry.x--; + if (b == ModBlocks.ore_beryllium) + MainRegistry.y++; + if (b == ModBlocks.block_beryllium) + MainRegistry.y--; + if (b == ModBlocks.ore_copper) + MainRegistry.z++; + if (b == ModBlocks.block_copper) + MainRegistry.z--; + } - return false; + return true; } @Override @@ -45,4 +50,9 @@ public class ItemWandD extends Item { return stack; } + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) + { + list.add("Used for debugging purposes."); + } } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 14b99dcc3..3d2849b2a 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -111,6 +111,19 @@ public class ModItems { public static Item powder_tungsten; public static Item powder_uranium; public static Item dust; + public static Item powder_power; + + public static Item powder_advanced_alloy; + public static Item powder_coal; + public static Item powder_combine_steel; + public static Item powder_diamond; + public static Item powder_emerald; + public static Item powder_lapis; + public static Item powder_quartz; + public static Item powder_magnetized_tungsten; + public static Item powder_red_copper; + public static Item powder_steel; + public static Item powder_lithium; public static Item coil_copper; public static Item coil_copper_torus; @@ -220,6 +233,9 @@ public class ModItems { public static Item cell_anti_schrabidium; public static Item singularity; public static Item singularity_counter_resonant; + public static Item singularity_super_heated; + public static Item black_hole; + public static Item crystal_xen; public static Item inf_water; public static Item inf_coolant; public static Item inf_deuterium; @@ -372,6 +388,8 @@ public class ModItems { public static Item gun_revolver_iron_ammo; public static Item gun_revolver_gold; public static Item gun_revolver_gold_ammo; + public static Item gun_revolver_lead; + public static Item gun_revolver_lead_ammo; public static Item gun_revolver_schrabidium; public static Item gun_revolver_schrabidium_ammo; public static Item gun_revolver_cursed; @@ -384,6 +402,8 @@ public class ModItems { public static Item gun_osipr_ammo; public static Item gun_osipr_ammo2; public static Item gun_zomg; + public static Item gun_super_shotgun; + public static Item gun_moist_nugget; public static Item gun_waluigi; public static Item grenade_generic; @@ -399,6 +419,7 @@ public class ModItems { public static Item grenade_tau; public static Item grenade_schrabidium; public static Item grenade_lemon; + public static Item grenade_mk2; public static Item grenade_nuke; public static Item grenade_nuclear; @@ -568,6 +589,7 @@ public class ModItems { public static Item igniter; public static Item detonator; + public static Item crate_caller; public static Item bucket_mud; @@ -651,7 +673,7 @@ public class ModItems { coil_advanced_alloy = new Item().setUnlocalizedName("coil_advanced_alloy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_advanced_alloy"); coil_advanced_torus = new Item().setUnlocalizedName("coil_advanced_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_advanced_torus"); ingot_magnetized_tungsten = new Item().setUnlocalizedName("ingot_magnetized_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_magnetized_tungsten"); - ingot_combine_steel = new Item().setUnlocalizedName("ingot_combine_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_combine_steel"); + ingot_combine_steel = new ItemCustomLore().setUnlocalizedName("ingot_combine_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":ingot_combine_steel"); nugget_uranium = new Item().setUnlocalizedName("nugget_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); nugget_u235 = new Item().setUnlocalizedName("nugget_u235").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":nugget_uranium"); @@ -688,6 +710,18 @@ public class ModItems { powder_tungsten = new Item().setUnlocalizedName("powder_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_tungsten"); powder_uranium = new Item().setUnlocalizedName("powder_uranium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_uranium"); dust = new ItemCustomLore().setUnlocalizedName("dust").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":dust"); + powder_advanced_alloy = new Item().setUnlocalizedName("powder_advanced_alloy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_advanced_alloy"); + powder_coal = new Item().setUnlocalizedName("powder_coal").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_coal"); + powder_combine_steel = new Item().setUnlocalizedName("powder_combine_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_combine_steel"); + powder_diamond = new Item().setUnlocalizedName("powder_diamond").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_diamond"); + powder_emerald = new Item().setUnlocalizedName("powder_emerald").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_emerald"); + powder_lapis = new Item().setUnlocalizedName("powder_lapis").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lapis"); + powder_quartz = new Item().setUnlocalizedName("powder_quartz").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_quartz"); + powder_magnetized_tungsten = new Item().setUnlocalizedName("powder_magnetized_tungsten").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_magnetized_tungsten"); + powder_red_copper = new Item().setUnlocalizedName("powder_red_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_red_copper"); + powder_steel = new Item().setUnlocalizedName("powder_steel").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_steel"); + powder_lithium = new Item().setUnlocalizedName("powder_lithium").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_lithium"); + powder_power = new Item().setUnlocalizedName("powder_power").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":powder_energy"); coil_copper = new Item().setUnlocalizedName("coil_copper").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper"); coil_copper_torus = new Item().setUnlocalizedName("coil_copper_torus").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":coil_copper_torus"); @@ -776,6 +810,9 @@ public class ModItems { cell_anti_schrabidium = new ItemDrop().setUnlocalizedName("cell_anti_schrabidium").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":cell_anti_schrabidium"); singularity = new ItemDrop().setUnlocalizedName("singularity").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity"); singularity_counter_resonant = new ItemDrop().setUnlocalizedName("singularity_counter_resonant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_alt"); + singularity_super_heated = new ItemDrop().setUnlocalizedName("singularity_super_heated").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_3"); + black_hole = new ItemDrop().setUnlocalizedName("black_hole").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.nuclear_waste).setTextureName(RefStrings.MODID + ":singularity_4"); + crystal_xen = new ItemDrop().setUnlocalizedName("crystal_xen").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":crystal_xen"); inf_water = new Item().setUnlocalizedName("inf_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_water"); inf_coolant = new Item().setUnlocalizedName("inf_coolant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_coolant"); inf_deuterium = new Item().setUnlocalizedName("inf_deuterium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_deuterium"); @@ -934,15 +971,17 @@ public class ModItems { gun_rpg = new GunRpg().setUnlocalizedName("gun_rpg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg"); gun_rpg_ammo = new Item().setUnlocalizedName("gun_rpg_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_rpg_ammo"); gun_revolver_ammo = new Item().setUnlocalizedName("gun_revolver_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_ammo"); - gun_revolver = new GunRevolver(gun_revolver_ammo, 10, 25, false).setMaxDamage(500).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver"); + gun_revolver = new GunRevolver(gun_revolver_ammo, 10, 25, false, false).setMaxDamage(500).setUnlocalizedName("gun_revolver").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver"); gun_revolver_iron_ammo = new Item().setUnlocalizedName("gun_revolver_iron_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_iron_ammo"); - gun_revolver_iron = new GunRevolver(gun_revolver_iron_ammo, 5, 15, false).setMaxDamage(100).setUnlocalizedName("gun_revolver_iron").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_iron"); + gun_revolver_iron = new GunRevolver(gun_revolver_iron_ammo, 5, 15, false, false).setMaxDamage(100).setUnlocalizedName("gun_revolver_iron").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_iron"); gun_revolver_gold_ammo = new Item().setUnlocalizedName("gun_revolver_gold_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_gold_ammo"); - gun_revolver_gold = new GunRevolver(gun_revolver_gold_ammo, 20, 30, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_gold"); + gun_revolver_gold = new GunRevolver(gun_revolver_gold_ammo, 20, 30, false, false).setMaxDamage(1000).setUnlocalizedName("gun_revolver_gold").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_gold"); + gun_revolver_lead_ammo = new Item().setUnlocalizedName("gun_revolver_lead_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_lead_ammo"); + gun_revolver_lead = new GunRevolver(gun_revolver_lead_ammo, 5, 15, false, true).setMaxDamage(250).setUnlocalizedName("gun_revolver_lead").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_lead"); gun_revolver_schrabidium_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_schrabidium_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium_ammo"); - gun_revolver_schrabidium = new GunRevolver(gun_revolver_schrabidium_ammo, 10000, 100000, true).setMaxDamage(100000).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium"); + gun_revolver_schrabidium = new GunRevolver(gun_revolver_schrabidium_ammo, 10000, 100000, true, false).setMaxDamage(100000).setUnlocalizedName("gun_revolver_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_schrabidium"); gun_revolver_cursed_ammo = new ItemCustomLore().setUnlocalizedName("gun_revolver_cursed_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_cursed_ammo"); - gun_revolver_cursed = new GunRevolver(gun_revolver_cursed_ammo, 25, 40, false).setMaxDamage(5000).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_cursed"); + gun_revolver_cursed = new GunRevolver(gun_revolver_cursed_ammo, 25, 40, false, false).setMaxDamage(5000).setUnlocalizedName("gun_revolver_cursed").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_revolver_cursed"); gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new GunFatman().setMaxDamage(5000).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_fatman"); gun_xvl1456_ammo = new Item().setUnlocalizedName("gun_xvl1456_ammo").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_xvl1456_ammo"); @@ -951,6 +990,8 @@ public class ModItems { gun_osipr_ammo2 = new Item().setUnlocalizedName("gun_osipr_ammo2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr_ammo2"); gun_osipr = new GunOSIPR().setUnlocalizedName("gun_osipr").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_osipr"); gun_zomg = new GunZOMG().setUnlocalizedName("gun_zomg").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_zomg"); + gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_super_shotgun"); + gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":gun_moist_nugget"); grenade_generic = new ItemGrenade().setUnlocalizedName("grenade_generic").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_generic"); grenade_strong = new ItemGrenade().setUnlocalizedName("grenade_strong").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_strong"); @@ -965,6 +1006,7 @@ public class ModItems { grenade_tau = new ItemGrenade().setUnlocalizedName("grenade_tau").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_tau"); grenade_schrabidium = new ItemGrenade().setUnlocalizedName("grenade_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_schrabidium"); grenade_lemon = new ItemGrenade().setUnlocalizedName("grenade_lemon").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_lemon"); + grenade_mk2 = new ItemGrenade().setUnlocalizedName("grenade_mk2").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_mk2_alt"); grenade_nuke = new ItemGrenade().setUnlocalizedName("grenade_nuke").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_nuke"); grenade_nuclear = new ItemGrenade().setUnlocalizedName("grenade_nuclear").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":grenade_nuclear"); @@ -1058,6 +1100,7 @@ public class ModItems { igniter = new ItemCustomLore().setUnlocalizedName("igniter").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":trigger"); detonator = new ItemDetonator().setUnlocalizedName("detonator").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":detonator"); + crate_caller = new ItemCrateCaller().setUnlocalizedName("crate_caller").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":crate_caller"); euphemium_helmet = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); euphemium_plate = new ArmorEuphemium(MainRegistry.enumArmorMaterialEuphemium, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); @@ -1212,22 +1255,34 @@ public class ModItems { GameRegistry.registerItem(sulfur, sulfur.getUnlocalizedName()); GameRegistry.registerItem(niter, niter.getUnlocalizedName()); GameRegistry.registerItem(fluorite, fluorite.getUnlocalizedName()); + GameRegistry.registerItem(powder_coal, powder_coal.getUnlocalizedName()); GameRegistry.registerItem(powder_iron, powder_iron.getUnlocalizedName()); GameRegistry.registerItem(powder_gold, powder_gold.getUnlocalizedName()); + GameRegistry.registerItem(powder_lapis, powder_lapis.getUnlocalizedName()); + GameRegistry.registerItem(powder_quartz, powder_quartz.getUnlocalizedName()); + GameRegistry.registerItem(powder_diamond, powder_diamond.getUnlocalizedName()); + GameRegistry.registerItem(powder_emerald, powder_emerald.getUnlocalizedName()); GameRegistry.registerItem(powder_uranium, powder_uranium.getUnlocalizedName()); GameRegistry.registerItem(powder_neptunium, powder_neptunium.getUnlocalizedName()); GameRegistry.registerItem(powder_titanium, powder_titanium.getUnlocalizedName()); GameRegistry.registerItem(powder_copper, powder_copper.getUnlocalizedName()); + GameRegistry.registerItem(powder_red_copper, powder_red_copper.getUnlocalizedName()); + GameRegistry.registerItem(powder_advanced_alloy, powder_advanced_alloy.getUnlocalizedName()); GameRegistry.registerItem(powder_tungsten, powder_tungsten.getUnlocalizedName()); GameRegistry.registerItem(powder_aluminium, powder_aluminium.getUnlocalizedName()); + GameRegistry.registerItem(powder_steel, powder_steel.getUnlocalizedName()); GameRegistry.registerItem(powder_lead, powder_lead.getUnlocalizedName()); GameRegistry.registerItem(powder_beryllium, powder_beryllium.getUnlocalizedName()); GameRegistry.registerItem(powder_schrabidium, powder_schrabidium.getUnlocalizedName()); + GameRegistry.registerItem(powder_magnetized_tungsten, powder_magnetized_tungsten.getUnlocalizedName()); + GameRegistry.registerItem(powder_combine_steel, powder_combine_steel.getUnlocalizedName()); + GameRegistry.registerItem(powder_lithium, powder_lithium.getUnlocalizedName()); GameRegistry.registerItem(dust, dust.getUnlocalizedName()); //Powders GameRegistry.registerItem(powder_fire, powder_fire.getUnlocalizedName()); GameRegistry.registerItem(powder_poison, powder_poison.getUnlocalizedName()); + GameRegistry.registerItem(powder_power, powder_power.getUnlocalizedName()); //Nuggets GameRegistry.registerItem(nugget_uranium, nugget_uranium.getUnlocalizedName()); @@ -1379,6 +1434,9 @@ public class ModItems { //OMG how the hell is that even possible!? GameRegistry.registerItem(singularity, singularity.getUnlocalizedName()); GameRegistry.registerItem(singularity_counter_resonant, singularity_counter_resonant.getUnlocalizedName()); + GameRegistry.registerItem(singularity_super_heated, singularity_super_heated.getUnlocalizedName()); + GameRegistry.registerItem(black_hole, black_hole.getUnlocalizedName()); + GameRegistry.registerItem(crystal_xen, crystal_xen.getUnlocalizedName()); //Infinite Tanks GameRegistry.registerItem(inf_water, inf_water.getUnlocalizedName()); @@ -1545,6 +1603,7 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_iron, gun_revolver_iron.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver, gun_revolver.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_gold, gun_revolver_gold.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_lead, gun_revolver_lead.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_schrabidium, gun_revolver_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_cursed, gun_revolver_cursed.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg, gun_rpg.getUnlocalizedName()); @@ -1552,11 +1611,14 @@ public class ModItems { GameRegistry.registerItem(gun_xvl1456, gun_xvl1456.getUnlocalizedName()); GameRegistry.registerItem(gun_osipr, gun_osipr.getUnlocalizedName()); GameRegistry.registerItem(gun_zomg, gun_zomg.getUnlocalizedName()); + GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName()); + GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName()); //Ammo GameRegistry.registerItem(gun_revolver_iron_ammo, gun_revolver_iron_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_ammo, gun_revolver_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_gold_ammo, gun_revolver_gold_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_revolver_lead_ammo, gun_revolver_lead_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_schrabidium_ammo, gun_revolver_schrabidium_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_revolver_cursed_ammo, gun_revolver_cursed_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); @@ -1588,6 +1650,7 @@ public class ModItems { GameRegistry.registerItem(grenade_tau, grenade_tau.getUnlocalizedName()); GameRegistry.registerItem(grenade_schrabidium, grenade_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(grenade_lemon, grenade_lemon.getUnlocalizedName()); + GameRegistry.registerItem(grenade_mk2, grenade_mk2.getUnlocalizedName()); GameRegistry.registerItem(grenade_nuke, grenade_nuke.getUnlocalizedName()); GameRegistry.registerItem(grenade_nuclear, grenade_nuclear.getUnlocalizedName()); @@ -1710,6 +1773,7 @@ public class ModItems { GameRegistry.registerItem(chainsaw, chainsaw.getUnlocalizedName()); GameRegistry.registerItem(igniter, igniter.getUnlocalizedName()); GameRegistry.registerItem(detonator, detonator.getUnlocalizedName()); + GameRegistry.registerItem(crate_caller, crate_caller.getUnlocalizedName()); GameRegistry.registerItem(hazmat_helmet, hazmat_helmet.getUnlocalizedName()); GameRegistry.registerItem(hazmat_plate, hazmat_plate.getUnlocalizedName()); GameRegistry.registerItem(hazmat_legs, hazmat_legs.getUnlocalizedName()); diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 75a8d332e..9a9474dcc 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -5,17 +5,17 @@ import java.util.List; import java.util.UUID; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.TileEntityLaunchPad; -import com.hbm.blocks.TileEntityMachineBattery; -import com.hbm.blocks.TileEntityMachineDeuterium; -import com.hbm.blocks.TileEntityMachineElectricFurnace; -import com.hbm.blocks.TileEntityWireCoated; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.entity.EntityHunterChopper; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; +import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.TileEntityMachineDeuterium; +import com.hbm.tileentity.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.TileEntityWireCoated; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 14abbfba2..0f0b791c1 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -5,38 +5,9 @@ import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.TileEntityBombMulti; -import com.hbm.blocks.TileEntityCable; -import com.hbm.blocks.TileEntityCrashedBomb; -import com.hbm.blocks.TileEntityDecoBlock; -import com.hbm.blocks.TileEntityDecoBlockAlt; -import com.hbm.blocks.TileEntityDecoBlockAltF; -import com.hbm.blocks.TileEntityDecoBlockAltG; -import com.hbm.blocks.TileEntityDecoBlockAltW; -import com.hbm.blocks.TileEntityDecoPoleSatelliteReceiver; -import com.hbm.blocks.TileEntityDecoPoleTop; -import com.hbm.blocks.TileEntityDecoSteelPoles; -import com.hbm.blocks.TileEntityDecoTapeRecorder; -import com.hbm.blocks.TileEntityLaunchPad; -import com.hbm.blocks.TileEntityMachineCentrifuge; -import com.hbm.blocks.TileEntityMachinePuF6Tank; -import com.hbm.blocks.TileEntityMachineUF6Tank; -import com.hbm.blocks.TileEntityNukeBoy; -import com.hbm.blocks.TileEntityNukeFleija; -import com.hbm.blocks.TileEntityNukeGadget; -import com.hbm.blocks.TileEntityNukeMan; -import com.hbm.blocks.TileEntityNukeMike; -import com.hbm.blocks.TileEntityNukePrototype; -import com.hbm.blocks.TileEntityNukeTsar; -import com.hbm.blocks.TileEntityObjTester; -import com.hbm.blocks.TileEntityRedBarrel; -import com.hbm.blocks.TileEntityRotationTester; -import com.hbm.blocks.TileEntityTestBombAdvanced; -import com.hbm.blocks.TileEntityTestContainer; -import com.hbm.blocks.TileEntityTestRender; -import com.hbm.blocks.TileEntityYellowBarrel; import com.hbm.entity.EntityBullet; import com.hbm.entity.EntityChopperMine; +import com.hbm.entity.EntityCloudFleija; import com.hbm.entity.EntityCombineBall; import com.hbm.entity.EntityGrenadeCluster; import com.hbm.entity.EntityGrenadeElectric; @@ -46,6 +17,7 @@ import com.hbm.entity.EntityGrenadeFrag; import com.hbm.entity.EntityGrenadeGas; import com.hbm.entity.EntityGrenadeGeneric; import com.hbm.entity.EntityGrenadeLemon; +import com.hbm.entity.EntityGrenadeMk2; import com.hbm.entity.EntityGrenadeNuclear; import com.hbm.entity.EntityGrenadeNuke; import com.hbm.entity.EntityGrenadePlasma; @@ -85,6 +57,7 @@ import com.hbm.particles.EntityBSmokeFX; import com.hbm.particles.EntitySmokeFX; import com.hbm.render.ItemRenderRevolverCursed; import com.hbm.render.ItemRenderRevolverIron; +import com.hbm.render.ItemRenderRevolverLead; import com.hbm.render.BSmokeRenderer; import com.hbm.render.ItemRenderBigSword; import com.hbm.render.ItemRenderDecoBlock; @@ -103,12 +76,14 @@ import com.hbm.render.ItemRenderTapeRecorder; import com.hbm.render.ItemRenderTestBombAdvanced; import com.hbm.render.ItemRenderTestContainer; import com.hbm.render.ItemRenderXVL1456; +import com.hbm.render.ItemRenderZOMG; import com.hbm.render.ModEffectRenderer; import com.hbm.render.RenderBigNuke; import com.hbm.render.RenderBombMulti; import com.hbm.render.RenderCable; import com.hbm.render.RenderCentrifuge; import com.hbm.render.RenderChopperMine; +import com.hbm.render.RenderCloudFleija; import com.hbm.render.RenderCrashedBomb; import com.hbm.render.RenderDecoBlock; import com.hbm.render.RenderDecoBlockAlt; @@ -148,6 +123,36 @@ import com.hbm.render.RenderTestRender; import com.hbm.render.RenderUF6Tank; import com.hbm.render.RenderYellowBarrel; import com.hbm.render.RendererObjTester; +import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.TileEntityCable; +import com.hbm.tileentity.TileEntityCrashedBomb; +import com.hbm.tileentity.TileEntityDecoBlock; +import com.hbm.tileentity.TileEntityDecoBlockAlt; +import com.hbm.tileentity.TileEntityDecoBlockAltF; +import com.hbm.tileentity.TileEntityDecoBlockAltG; +import com.hbm.tileentity.TileEntityDecoBlockAltW; +import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; +import com.hbm.tileentity.TileEntityDecoPoleTop; +import com.hbm.tileentity.TileEntityDecoSteelPoles; +import com.hbm.tileentity.TileEntityDecoTapeRecorder; +import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.TileEntityObjTester; +import com.hbm.tileentity.TileEntityRedBarrel; +import com.hbm.tileentity.TileEntityRotationTester; +import com.hbm.tileentity.TileEntityTestBombAdvanced; +import com.hbm.tileentity.TileEntityTestContainer; +import com.hbm.tileentity.TileEntityTestRender; +import com.hbm.tileentity.TileEntityYellowBarrel; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -205,6 +210,7 @@ public class ClientProxy extends ServerProxy 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 RenderSnowball(ModItems.grenade_mk2)); RenderingRegistry.registerEntityRenderingHandler(EntitySchrab.class, new RenderFlare()); @@ -216,6 +222,7 @@ public class ClientProxy extends ServerProxy RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudSmall.class, new RenderSmallNukeAlt()); RenderingRegistry.registerEntityRenderingHandler(EntityNukeCloudBig.class, new RenderBigNuke()); + RenderingRegistry.registerEntityRenderingHandler(EntityCloudFleija.class, new RenderCloudFleija()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoTapeRecorder.class, new RenderTapeRecorder()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDecoSteelPoles.class, new RenderSteelPoles()); @@ -230,10 +237,12 @@ public class ClientProxy extends ServerProxy MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver, new ItemRenderRevolver()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_iron, new ItemRenderRevolverIron()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_gold, new ItemRenderRevolverGold()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_lead, new ItemRenderRevolverLead()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_schrabidium, new ItemRenderRevolverSchrabidium()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_revolver_cursed, new ItemRenderRevolverCursed()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_fatman, new ItemRenderFatMan()); MinecraftForgeClient.registerItemRenderer(ModItems.gun_xvl1456, new ItemRenderXVL1456()); + MinecraftForgeClient.registerItemRenderer(ModItems.gun_zomg, new ItemRenderZOMG()); RenderingRegistry.registerEntityRenderingHandler(EntityBullet.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityMiniNuke.class, new RenderMiniNuke()); diff --git a/com/hbm/main/GUIHandler.java b/com/hbm/main/GUIHandler.java index 7b7a7b8f3..4dbc137f6 100644 --- a/com/hbm/main/GUIHandler.java +++ b/com/hbm/main/GUIHandler.java @@ -1,38 +1,6 @@ package com.hbm.main; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.TileEntityBombMulti; -import com.hbm.blocks.TileEntityConverterHeRf; -import com.hbm.blocks.TileEntityConverterRfHe; -import com.hbm.blocks.TileEntityCoreAdvanced; -import com.hbm.blocks.TileEntityCoreTitanium; -import com.hbm.blocks.TileEntityDiFurnace; -import com.hbm.blocks.TileEntityFusionMultiblock; -import com.hbm.blocks.TileEntityLaunchPad; -import com.hbm.blocks.TileEntityMachineBattery; -import com.hbm.blocks.TileEntityMachineCoal; -import com.hbm.blocks.TileEntityMachineDeuterium; -import com.hbm.blocks.TileEntityMachineDiesel; -import com.hbm.blocks.TileEntityMachineElectricFurnace; -import com.hbm.blocks.TileEntityMachineGenerator; -import com.hbm.blocks.TileEntityMachineCentrifuge; -import com.hbm.blocks.TileEntityMachinePuF6Tank; -import com.hbm.blocks.TileEntityMachineReactor; -import com.hbm.blocks.TileEntityMachineSchrabidiumTransmutator; -import com.hbm.blocks.TileEntityMachineShredder; -import com.hbm.blocks.TileEntityMachineUF6Tank; -import com.hbm.blocks.TileEntityNukeBoy; -import com.hbm.blocks.TileEntityNukeFleija; -import com.hbm.blocks.TileEntityNukeFurnace; -import com.hbm.blocks.TileEntityNukeGadget; -import com.hbm.blocks.TileEntityNukeMan; -import com.hbm.blocks.TileEntityNukeMike; -import com.hbm.blocks.TileEntityNukePrototype; -import com.hbm.blocks.TileEntityNukeTsar; -import com.hbm.blocks.TileEntityReactorMultiblock; -import com.hbm.blocks.TileEntityRtgFurnace; -import com.hbm.blocks.TileEntityTestNuke; -import com.hbm.blocks.TileEntityWatzCore; import com.hbm.gui.ContainerBombMulti; import com.hbm.gui.ContainerDiFurnace; import com.hbm.gui.ContainerCentrifuge; @@ -97,6 +65,38 @@ import com.hbm.gui.GUIRtgFurnace; import com.hbm.gui.GUITestDiFurnace; import com.hbm.gui.GUITestNuke; import com.hbm.gui.GUIWatzCore; +import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.TileEntityConverterHeRf; +import com.hbm.tileentity.TileEntityConverterRfHe; +import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.TileEntityDiFurnace; +import com.hbm.tileentity.TileEntityFusionMultiblock; +import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.TileEntityMachineCoal; +import com.hbm.tileentity.TileEntityMachineDeuterium; +import com.hbm.tileentity.TileEntityMachineDiesel; +import com.hbm.tileentity.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.TileEntityMachineGenerator; +import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.TileEntityMachineReactor; +import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.TileEntityMachineShredder; +import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.TileEntityNukeFurnace; +import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.TileEntityReactorMultiblock; +import com.hbm.tileentity.TileEntityRtgFurnace; +import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.TileEntityWatzCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index 6e9350b0a..73d663e54 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -21,59 +21,13 @@ import cpw.mods.fml.common.Mod.Metadata; import cpw.mods.fml.common.ModMetadata; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.TileEntityBombMulti; -import com.hbm.blocks.TileEntityCable; -import com.hbm.blocks.TileEntityConverterHeRf; -import com.hbm.blocks.TileEntityConverterRfHe; -import com.hbm.blocks.TileEntityCoreAdvanced; -import com.hbm.blocks.TileEntityCoreTitanium; -import com.hbm.blocks.TileEntityCrashedBomb; -import com.hbm.blocks.TileEntityDecoBlock; -import com.hbm.blocks.TileEntityDecoPoleSatelliteReceiver; -import com.hbm.blocks.TileEntityDecoPoleTop; -import com.hbm.blocks.TileEntityDecoSteelPoles; -import com.hbm.blocks.TileEntityDecoTapeRecorder; -import com.hbm.blocks.TileEntityDiFurnace; -import com.hbm.blocks.TileEntityFusionMultiblock; -import com.hbm.blocks.TileEntityLaunchPad; -import com.hbm.blocks.TileEntityMachineBattery; -import com.hbm.blocks.TileEntityMachineCoal; -import com.hbm.blocks.TileEntityMachineDeuterium; -import com.hbm.blocks.TileEntityMachineDiesel; -import com.hbm.blocks.TileEntityMachineElectricFurnace; -import com.hbm.blocks.TileEntityMachineGenerator; -import com.hbm.blocks.TileEntityMachineCentrifuge; -import com.hbm.blocks.TileEntityMachinePuF6Tank; -import com.hbm.blocks.TileEntityMachineReactor; -import com.hbm.blocks.TileEntityMachineSchrabidiumTransmutator; -import com.hbm.blocks.TileEntityMachineShredder; -import com.hbm.blocks.TileEntityMachineUF6Tank; -import com.hbm.blocks.TileEntityNukeBoy; -import com.hbm.blocks.TileEntityNukeFleija; -import com.hbm.blocks.TileEntityNukeFurnace; -import com.hbm.blocks.TileEntityNukeGadget; -import com.hbm.blocks.TileEntityNukeMan; -import com.hbm.blocks.TileEntityNukeMike; -import com.hbm.blocks.TileEntityNukePrototype; -import com.hbm.blocks.TileEntityNukeTsar; -import com.hbm.blocks.TileEntityObjTester; -import com.hbm.blocks.TileEntityReactorMultiblock; -import com.hbm.blocks.TileEntityRedBarrel; -import com.hbm.blocks.TileEntityRotationTester; -import com.hbm.blocks.TileEntityRtgFurnace; -import com.hbm.blocks.TileEntityTestBombAdvanced; -import com.hbm.blocks.TileEntityTestContainer; -import com.hbm.blocks.TileEntityTestNuke; -import com.hbm.blocks.TileEntityTestRender; -import com.hbm.blocks.TileEntityWatzCore; -import com.hbm.blocks.TileEntityWireCoated; -import com.hbm.blocks.TileEntityYellowBarrel; import com.hbm.creativetabs.BlockTab; import com.hbm.creativetabs.NukeTab; import com.hbm.creativetabs.PartsTab; import com.hbm.creativetabs.TestTab; import com.hbm.entity.EntityBullet; import com.hbm.entity.EntityChopperMine; +import com.hbm.entity.EntityCloudFleija; import com.hbm.entity.EntityCombineBall; import com.hbm.entity.EntityGrenadeCluster; import com.hbm.entity.EntityGrenadeElectric; @@ -83,6 +37,7 @@ import com.hbm.entity.EntityGrenadeFrag; import com.hbm.entity.EntityGrenadeGas; import com.hbm.entity.EntityGrenadeGeneric; import com.hbm.entity.EntityGrenadeLemon; +import com.hbm.entity.EntityGrenadeMk2; import com.hbm.entity.EntityGrenadeNuclear; import com.hbm.entity.EntityGrenadeNuke; import com.hbm.entity.EntityGrenadePlasma; @@ -128,6 +83,53 @@ import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import com.hbm.particles.EntityBSmokeFX; import com.hbm.particles.EntitySmokeFX; +import com.hbm.tileentity.TileEntityBombMulti; +import com.hbm.tileentity.TileEntityCable; +import com.hbm.tileentity.TileEntityConverterHeRf; +import com.hbm.tileentity.TileEntityConverterRfHe; +import com.hbm.tileentity.TileEntityCoreAdvanced; +import com.hbm.tileentity.TileEntityCoreTitanium; +import com.hbm.tileentity.TileEntityCrashedBomb; +import com.hbm.tileentity.TileEntityDecoBlock; +import com.hbm.tileentity.TileEntityDecoPoleSatelliteReceiver; +import com.hbm.tileentity.TileEntityDecoPoleTop; +import com.hbm.tileentity.TileEntityDecoSteelPoles; +import com.hbm.tileentity.TileEntityDecoTapeRecorder; +import com.hbm.tileentity.TileEntityDiFurnace; +import com.hbm.tileentity.TileEntityFusionMultiblock; +import com.hbm.tileentity.TileEntityLaunchPad; +import com.hbm.tileentity.TileEntityMachineBattery; +import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.TileEntityMachineCoal; +import com.hbm.tileentity.TileEntityMachineDeuterium; +import com.hbm.tileentity.TileEntityMachineDiesel; +import com.hbm.tileentity.TileEntityMachineElectricFurnace; +import com.hbm.tileentity.TileEntityMachineGenerator; +import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.TileEntityMachineReactor; +import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; +import com.hbm.tileentity.TileEntityMachineShredder; +import com.hbm.tileentity.TileEntityMachineUF6Tank; +import com.hbm.tileentity.TileEntityNukeBoy; +import com.hbm.tileentity.TileEntityNukeFleija; +import com.hbm.tileentity.TileEntityNukeFurnace; +import com.hbm.tileentity.TileEntityNukeGadget; +import com.hbm.tileentity.TileEntityNukeMan; +import com.hbm.tileentity.TileEntityNukeMike; +import com.hbm.tileentity.TileEntityNukePrototype; +import com.hbm.tileentity.TileEntityNukeTsar; +import com.hbm.tileentity.TileEntityObjTester; +import com.hbm.tileentity.TileEntityReactorMultiblock; +import com.hbm.tileentity.TileEntityRedBarrel; +import com.hbm.tileentity.TileEntityRotationTester; +import com.hbm.tileentity.TileEntityRtgFurnace; +import com.hbm.tileentity.TileEntityTestBombAdvanced; +import com.hbm.tileentity.TileEntityTestContainer; +import com.hbm.tileentity.TileEntityTestNuke; +import com.hbm.tileentity.TileEntityTestRender; +import com.hbm.tileentity.TileEntityWatzCore; +import com.hbm.tileentity.TileEntityWireCoated; +import com.hbm.tileentity.TileEntityYellowBarrel; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -339,6 +341,8 @@ public class MainRegistry EntityRegistry.registerModEntity(EntityCombineBall.class, "entity_combine_ball", 44, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityRainbow.class, "entity_rainbow", 45, this, 1000, 1, true); EntityRegistry.registerModEntity(EntityGrenadeLemon.class, "entity_grenade_lemon", 46, this, 500, 1, true); + EntityRegistry.registerModEntity(EntityCloudFleija.class, "entity_cloud_fleija", 47, this, 500, 1, true); + EntityRegistry.registerModEntity(EntityGrenadeMk2.class, "entity_grenade_mk2", 48, this, 500, 1, true); EntityRegistry.registerGlobalEntityID(EntityNuclearCreeper.class, "entity_mob_nuclear_creeper", EntityRegistry.findGlobalUniqueEntityId(), 0x204131, 0x75CE00); EntityRegistry.registerGlobalEntityID(EntityHunterChopper.class, "entity_mob_hunter_chopper", EntityRegistry.findGlobalUniqueEntityId(), 0xffffff, 0xffffff); @@ -373,11 +377,15 @@ public class MainRegistry OreDictionary.registerOre("ingotCopper", ModItems.ingot_copper); OreDictionary.registerOre("ingotRedAlloy", ModItems.ingot_red_copper); OreDictionary.registerOre("ingotRedstoneAlloy", ModItems.ingot_red_copper); + OreDictionary.registerOre("ingotAdvanced", ModItems.ingot_advanced_alloy); + OreDictionary.registerOre("ingotAdvancedAlloy", ModItems.ingot_advanced_alloy); OreDictionary.registerOre("ingotTungsten", ModItems.ingot_tungsten); OreDictionary.registerOre("ingotAluminum", ModItems.ingot_aluminium); OreDictionary.registerOre("ingotNeptunium", ModItems.ingot_neptunium); OreDictionary.registerOre("ingotLead", ModItems.ingot_lead); OreDictionary.registerOre("ingotLithium", ModItems.lithium); + OreDictionary.registerOre("ingotMagnetizedTungsten", ModItems.ingot_magnetized_tungsten); + OreDictionary.registerOre("ingotCMBSteel", ModItems.ingot_combine_steel); OreDictionary.registerOre("dustFluorite", ModItems.fluorite); OreDictionary.registerOre("nuggetLead", ModItems.nugget_lead); OreDictionary.registerOre("nuggetUranium", ModItems.nugget_uranium); @@ -412,6 +420,20 @@ public class MainRegistry OreDictionary.registerOre("dustCopper", ModItems.powder_copper); OreDictionary.registerOre("dustBeryllium", ModItems.powder_beryllium); OreDictionary.registerOre("dustAluminum", ModItems.powder_aluminium); + OreDictionary.registerOre("dustDiamond", ModItems.powder_diamond); + OreDictionary.registerOre("dustEmerald", ModItems.powder_emerald); + OreDictionary.registerOre("dustLapis", ModItems.powder_lapis); + OreDictionary.registerOre("dustCoal", ModItems.powder_coal); + OreDictionary.registerOre("dustAdvanced", ModItems.powder_advanced_alloy); + OreDictionary.registerOre("dustCMBSteel", ModItems.powder_combine_steel); + OreDictionary.registerOre("dustMagnetizedTungsten", ModItems.powder_magnetized_tungsten); + OreDictionary.registerOre("dustRedAlloy", ModItems.powder_red_copper); + OreDictionary.registerOre("dustRedstoneAlloy", ModItems.powder_red_copper); + OreDictionary.registerOre("dustSteel", ModItems.powder_steel); + OreDictionary.registerOre("dustLithium", ModItems.powder_lithium); + OreDictionary.registerOre("dustQuartz", ModItems.powder_quartz); + + OreDictionary.registerOre("gemCoal", Items.coal); OreDictionary.registerOre("oreUranium", ModBlocks.ore_uranium); OreDictionary.registerOre("oreTitanium", ModBlocks.ore_titanium); @@ -432,12 +454,18 @@ public class MainRegistry OreDictionary.registerOre("blockNiter", ModBlocks.block_niter); OreDictionary.registerOre("blockSalpeter", ModBlocks.block_niter); OreDictionary.registerOre("blockCopper", ModBlocks.block_copper); + OreDictionary.registerOre("blockRedAlloy", ModBlocks.block_red_copper); + OreDictionary.registerOre("blockRedstoneAlloy", ModBlocks.block_red_copper); + OreDictionary.registerOre("blockAdvanced", ModBlocks.block_advanced_alloy); OreDictionary.registerOre("blockTungsten", ModBlocks.block_tungsten); OreDictionary.registerOre("blockAluminum", ModBlocks.block_aluminium); OreDictionary.registerOre("blockFluorite", ModBlocks.block_fluorite); OreDictionary.registerOre("blockSteel", ModBlocks.block_steel); OreDictionary.registerOre("blockLead", ModBlocks.block_lead); OreDictionary.registerOre("blockBeryllium", ModBlocks.block_beryllium); + OreDictionary.registerOre("blockSchrabidium", ModBlocks.block_schrabidium); + OreDictionary.registerOre("blockCMBSteel", ModBlocks.block_combine_steel); + OreDictionary.registerOre("blockMagnetizedTungsten", ModBlocks.block_magnetized_tungsten); } @EventHandler @@ -452,6 +480,8 @@ public class MainRegistry recipes.overridePreSetRecipe(new ItemStack(ModItems.scrap), new ItemStack(ModItems.dust)); recipes.overridePreSetRecipe(new ItemStack(ModItems.dust), new ItemStack(ModItems.dust)); recipes.overridePreSetRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); + recipes.overridePreSetRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(ModItems.powder_lapis)); + recipes.overridePreSetRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(ModItems.powder_quartz)); recipes.PrintRecipes(); } diff --git a/com/hbm/render/ItemRenderRevolverLead.java b/com/hbm/render/ItemRenderRevolverLead.java new file mode 100644 index 000000000..929796b46 --- /dev/null +++ b/com/hbm/render/ItemRenderRevolverLead.java @@ -0,0 +1,66 @@ +package com.hbm.render; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +public class ItemRenderRevolverLead implements IItemRenderer { + + protected ModelRevolver swordModel; + + public ItemRenderRevolverLead() { + swordModel = new ModelRevolver(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + switch(type) { + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + case ENTITY: + return true; + default: return false; + } + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + switch(type) { + case EQUIPPED_FIRST_PERSON: + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverLead.png")); + GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.5F, 0.0F, -0.2F); + //GL11.glScalef(2.0F, 2.0F, 2.0F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + break; + case EQUIPPED: + case ENTITY: + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelRevolverLead.png")); + GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.2F, -0.5F); + //GL11.glScalef(2.0F, 2.0F, 2.0F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + default: break; + } + } +} diff --git a/com/hbm/render/ItemRenderTestBombAdvanced.java b/com/hbm/render/ItemRenderTestBombAdvanced.java index 72c39beb2..dbf954dd0 100644 --- a/com/hbm/render/ItemRenderTestBombAdvanced.java +++ b/com/hbm/render/ItemRenderTestBombAdvanced.java @@ -2,8 +2,8 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.TileEntityTestBombAdvanced; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityTestBombAdvanced; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/com/hbm/render/ItemRenderTestContainer.java b/com/hbm/render/ItemRenderTestContainer.java index bbee3ea46..0c854914d 100644 --- a/com/hbm/render/ItemRenderTestContainer.java +++ b/com/hbm/render/ItemRenderTestContainer.java @@ -1,6 +1,6 @@ package com.hbm.render; -import com.hbm.blocks.TileEntityTestContainer; +import com.hbm.tileentity.TileEntityTestContainer; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/com/hbm/render/ItemRenderZOMG.java b/com/hbm/render/ItemRenderZOMG.java new file mode 100644 index 000000000..bd01e833c --- /dev/null +++ b/com/hbm/render/ItemRenderZOMG.java @@ -0,0 +1,73 @@ +package com.hbm.render; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; + +public class ItemRenderZOMG implements IItemRenderer { + + protected ModelZOMG swordModel; + + public ItemRenderZOMG() { + swordModel = new ModelZOMG(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + switch(type) { + case EQUIPPED: + case EQUIPPED_FIRST_PERSON: + case ENTITY: + return true; + default: return false; + } + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return false; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + switch(type) { + case EQUIPPED_FIRST_PERSON: + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelZOMG.png")); + GL11.glRotatef(-135.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.5F, 0.0F, -0.2F); + //GL11.glScalef(2.0F, 2.0F, 2.0F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + GL11.glTranslatef(-0.4F, -0.1F, -0.1F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + break; + case EQUIPPED: + case ENTITY: + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_CULL_FACE); + Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelZOMG.png")); + GL11.glRotatef(-200.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(75.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-30.0F, 1.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, -0.2F, -0.5F); + GL11.glRotatef(-5.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(0.5F, -0.2F, 0.0F); + GL11.glScalef(1.5F, 1.5F, 1.5F); + GL11.glTranslatef(-0.4F, -0.1F, -0.1F); + swordModel.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); + GL11.glPopMatrix(); + default: break; + } + } +} diff --git a/com/hbm/render/ModelXVL1456.java b/com/hbm/render/ModelXVL1456.java index 4f77d658b..c0f151bf5 100644 --- a/com/hbm/render/ModelXVL1456.java +++ b/com/hbm/render/ModelXVL1456.java @@ -4,299 +4,289 @@ // Keep in mind that you still need to fill in some blanks // - ZeuX - - - - - package com.hbm.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -public class ModelXVL1456 extends ModelBase -{ - //fields - ModelRenderer CoilFront; - ModelRenderer Panel1; - ModelRenderer Panel2; - ModelRenderer Panel3; - ModelRenderer CoilBack; - ModelRenderer SpinPivot; - ModelRenderer Barrel; - ModelRenderer CoilBarrel; - ModelRenderer PipeBarrel; - ModelRenderer PipeHolder; - ModelRenderer Rail1; - ModelRenderer Rail2; - ModelRenderer Rail3; - ModelRenderer Rail4; - ModelRenderer Rail5; - ModelRenderer Rail6; - ModelRenderer TankHolder; - ModelRenderer HandleBase; - ModelRenderer HandleShaft; - ModelRenderer HanldeGrip; - ModelRenderer SpinC1; - ModelRenderer SpinC2; - ModelRenderer SpinC3; - ModelRenderer SpinP1; - ModelRenderer SpinP2; - ModelRenderer SpinP3; - ModelRenderer Battery1; - ModelRenderer Battery2; - ModelRenderer StockBase; - ModelRenderer StockTrigger; - ModelRenderer Shape1; - int i = 0; - - public ModelXVL1456() - { - textureWidth = 128; - textureHeight = 64; - - CoilFront = new ModelRenderer(this, 0, 0); - CoilFront.addBox(0F, 0F, 0F, 4, 10, 10); - CoilFront.setRotationPoint(0F, 0F, 0F); - CoilFront.setTextureSize(128, 64); - CoilFront.mirror = true; - setRotation(CoilFront, 0F, 0F, 0F); - Panel1 = new ModelRenderer(this, 0, 40); - Panel1.addBox(0F, 0F, 0F, 5, 11, 3); - Panel1.setRotationPoint(4F, -1F, 3.5F); - Panel1.setTextureSize(128, 64); - Panel1.mirror = true; - setRotation(Panel1, 0F, 0F, 0F); - Panel2 = new ModelRenderer(this, 0, 54); - Panel2.addBox(0F, 0F, 0F, 5, 3, 3); - Panel2.setRotationPoint(9F, -1F, 3.5F); - Panel2.setTextureSize(128, 64); - Panel2.mirror = true; - setRotation(Panel2, 0F, 0F, 0F); - Panel3 = new ModelRenderer(this, 16, 40); - Panel3.addBox(0F, 0F, 0F, 3, 11, 3); - Panel3.setRotationPoint(14F, -1F, 3.5F); - Panel3.setTextureSize(128, 64); - Panel3.mirror = true; - setRotation(Panel3, 0F, 0F, 0F); - CoilBack = new ModelRenderer(this, 0, 20); - CoilBack.addBox(0F, 0F, 0F, 4, 10, 10); - CoilBack.setRotationPoint(17F, 0F, 0F); - CoilBack.setTextureSize(128, 64); - CoilBack.mirror = true; - setRotation(CoilBack, 0F, 0F, 0F); - SpinPivot = new ModelRenderer(this, 66, 42); - SpinPivot.addBox(0F, 0F, 0F, 5, 1, 1); - SpinPivot.setRotationPoint(9F, 5.5F, 4.5F); - SpinPivot.setTextureSize(128, 64); - SpinPivot.mirror = true; - setRotation(SpinPivot, 0F, 0F, 0F); - Barrel = new ModelRenderer(this, 64, 0); - Barrel.addBox(0F, 0F, 0F, 28, 1, 1); - Barrel.setRotationPoint(-28F, 4.5F, 4.5F); - Barrel.setTextureSize(128, 64); - Barrel.mirror = true; - setRotation(Barrel, 0F, 0F, 0F); - CoilBarrel = new ModelRenderer(this, 28, 4); - CoilBarrel.addBox(0F, 0F, 0F, 9, 7, 7); - CoilBarrel.setRotationPoint(-19F, 1.5F, 1.5F); - CoilBarrel.setTextureSize(128, 64); - CoilBarrel.mirror = true; - setRotation(CoilBarrel, 0F, 0F, 0F); - PipeBarrel = new ModelRenderer(this, 28, 0); - PipeBarrel.addBox(0F, 0F, 0F, 16, 2, 2); - PipeBarrel.setRotationPoint(-13F, 6F, -0.4666667F); - PipeBarrel.setTextureSize(128, 64); - PipeBarrel.mirror = true; - setRotation(PipeBarrel, 0F, 0F, 0F); - PipeHolder = new ModelRenderer(this, 42, 37); - PipeHolder.addBox(0F, 0F, 0F, 3, 4, 1); - PipeHolder.setRotationPoint(0.5F, 5F, -1F); - PipeHolder.setTextureSize(128, 64); - PipeHolder.mirror = true; - setRotation(PipeHolder, 0F, 0F, 0F); - Rail1 = new ModelRenderer(this, 28, 27); - Rail1.addBox(0F, 0F, 0F, 1, 5, 1); - Rail1.setRotationPoint(5F, -2F, 2.5F); - Rail1.setTextureSize(128, 64); - Rail1.mirror = true; - setRotation(Rail1, 0F, 0F, 0F); - Rail2 = new ModelRenderer(this, 32, 27); - Rail2.addBox(0F, 0F, 0F, 1, 5, 1); - Rail2.setRotationPoint(5F, -2F, 6.5F); - Rail2.setTextureSize(128, 64); - Rail2.mirror = true; - setRotation(Rail2, 0F, 0F, 0F); - Rail3 = new ModelRenderer(this, 28, 23); - Rail3.addBox(0F, 0F, 0F, 18, 1, 1); - Rail3.setRotationPoint(-12F, -3F, 2.5F); - Rail3.setTextureSize(128, 64); - Rail3.mirror = true; - setRotation(Rail3, 0F, 0F, 0F); - Rail4 = new ModelRenderer(this, 28, 25); - Rail4.addBox(0F, 0F, 0F, 18, 1, 1); - Rail4.setRotationPoint(-12F, -3F, 6.5F); - Rail4.setTextureSize(128, 64); - Rail4.mirror = true; - setRotation(Rail4, 0F, 0F, 0F); - Rail5 = new ModelRenderer(this, 28, 18); - Rail5.addBox(0F, 0F, 0F, 1, 4, 1); - Rail5.setRotationPoint(-12F, -2F, 2.5F); - Rail5.setTextureSize(128, 64); - Rail5.mirror = true; - setRotation(Rail5, 0F, 0F, 0F); - Rail6 = new ModelRenderer(this, 32, 18); - Rail6.addBox(0F, 0F, 0F, 1, 4, 1); - Rail6.setRotationPoint(-12F, -2F, 6.5F); - Rail6.setTextureSize(128, 64); - Rail6.mirror = true; - setRotation(Rail6, 0F, 0F, 0F); - TankHolder = new ModelRenderer(this, 42, 27); - TankHolder.addBox(0F, 0F, 0F, 4, 2, 1); - TankHolder.setRotationPoint(4.5F, 4F, 2.5F); - TankHolder.setTextureSize(128, 64); - TankHolder.mirror = true; - setRotation(TankHolder, 0F, 0F, 0F); - HandleBase = new ModelRenderer(this, 28, 33); - HandleBase.addBox(0F, 0F, 0F, 6, 1, 1); - HandleBase.setRotationPoint(9F, -2F, 4.5F); - HandleBase.setTextureSize(128, 64); - HandleBase.mirror = true; - setRotation(HandleBase, 0F, 0F, 0F); - HandleShaft = new ModelRenderer(this, 28, 35); - HandleShaft.addBox(0F, 0F, 0F, 1, 3, 1); - HandleShaft.setRotationPoint(8F, -4F, 4.5F); - HandleShaft.setTextureSize(128, 64); - HandleShaft.mirror = true; - setRotation(HandleShaft, 0F, 0F, 0F); - HanldeGrip = new ModelRenderer(this, 28, 39); - HanldeGrip.addBox(0F, 0F, 0F, 5, 2, 2); - HanldeGrip.setRotationPoint(9F, -5F, 4F); - HanldeGrip.setTextureSize(128, 64); - HanldeGrip.mirror = true; - setRotation(HanldeGrip, 0F, 0F, 0F); - SpinC1 = new ModelRenderer(this, 66, 21); - SpinC1.addBox(0F, -3.5F, -2F, 4, 3, 4); - SpinC1.setRotationPoint(9.5F, 6F, 5F); - SpinC1.setTextureSize(128, 64); - SpinC1.mirror = true; - setRotation(SpinC1, 0F, 0F, 0F); - SpinC2 = new ModelRenderer(this, 66, 28); - SpinC2.addBox(0F, -3.5F, -2F, 4, 3, 4); - SpinC2.setRotationPoint(9.5F, 6F, 5F); - SpinC2.setTextureSize(128, 64); - SpinC2.mirror = true; - setRotation(SpinC2, 2.094395F, 0F, 0F); - SpinC3 = new ModelRenderer(this, 66, 35); - SpinC3.addBox(0F, -3.5F, -2F, 4, 3, 4); - SpinC3.setRotationPoint(9.5F, 6F, 5F); - SpinC3.setTextureSize(128, 64); - SpinC3.mirror = true; - setRotation(SpinC3, -2.094395F, 0F, 0F); - SpinP1 = new ModelRenderer(this, 82, 21); - SpinP1.addBox(0F, -3F, -1.5F, 3, 2, 3); - SpinP1.setRotationPoint(10F, 6F, 5F); - SpinP1.setTextureSize(128, 64); - SpinP1.mirror = true; - setRotation(SpinP1, 1.047198F, 0F, 0F); - SpinP2 = new ModelRenderer(this, 82, 26); - SpinP2.addBox(0F, -3F, -1.5F, 3, 2, 3); - SpinP2.setRotationPoint(10F, 6F, 5F); - SpinP2.setTextureSize(128, 64); - SpinP2.mirror = true; - setRotation(SpinP2, 3.141593F, 0F, 0F); - SpinP3 = new ModelRenderer(this, 82, 31); - SpinP3.addBox(0F, -3F, -1.5F, 3, 2, 3); - SpinP3.setRotationPoint(10F, 6F, 5F); - SpinP3.setTextureSize(128, 64); - SpinP3.mirror = true; - setRotation(SpinP3, -1.047198F, 0F, 0F); - Battery1 = new ModelRenderer(this, 64, 2); - Battery1.addBox(0F, 0F, 0F, 1, 1, 3); - Battery1.setRotationPoint(17.8F, -1F, 3.5F); - Battery1.setTextureSize(128, 64); - Battery1.mirror = true; - setRotation(Battery1, 0F, 0F, 0F); - Battery2 = new ModelRenderer(this, 72, 2); - Battery2.addBox(0F, 0F, 0F, 1, 1, 3); - Battery2.setRotationPoint(19.3F, -1F, 3.5F); - Battery2.setTextureSize(128, 64); - Battery2.mirror = true; - setRotation(Battery2, 0F, 0F, 0F); - StockBase = new ModelRenderer(this, 60, 12); - StockBase.addBox(0F, 0F, 0F, 12, 6, 3); - StockBase.setRotationPoint(22F, 7F, 3.5F); - StockBase.setTextureSize(128, 64); - StockBase.mirror = true; - setRotation(StockBase, 0F, 0F, 0F); - StockTrigger = new ModelRenderer(this, 60, 6); - StockTrigger.addBox(-3.5F, -1.5F, 0F, 5, 4, 2); - StockTrigger.setRotationPoint(22F, 10F, 4F); - StockTrigger.setTextureSize(128, 64); - StockTrigger.mirror = true; - setRotation(StockTrigger, 0F, 0F, 0.7853982F); - Shape1 = new ModelRenderer(this, 42, 30); - Shape1.addBox(0F, -1F, -1F, 2, 5, 2); - Shape1.setRotationPoint(5.5F, 6F, 2.5F); - Shape1.setTextureSize(128, 64); - Shape1.mirror = true; - setRotation(Shape1, -0.7853982F, 0F, 0F); - } - - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float rot) - { - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - CoilFront.render(f5); - Panel1.render(f5); - Panel2.render(f5); - Panel3.render(f5); - CoilBack.render(f5); - SpinPivot.render(f5); - Barrel.render(f5); - CoilBarrel.render(f5); - PipeBarrel.render(f5); - PipeHolder.render(f5); - Rail1.render(f5); - Rail2.render(f5); - Rail3.render(f5); - Rail4.render(f5); - Rail5.render(f5); - Rail6.render(f5); - TankHolder.render(f5); - HandleBase.render(f5); - HandleShaft.render(f5); - HanldeGrip.render(f5); - SpinC1.rotateAngleX += rot; - SpinC2.rotateAngleX += rot; - SpinC3.rotateAngleX += rot; - SpinP1.rotateAngleX += rot; - SpinP2.rotateAngleX += rot; - SpinP3.rotateAngleX += rot; - SpinC1.render(f5); - SpinC2.render(f5); - SpinC3.render(f5); - SpinP1.render(f5); - SpinP2.render(f5); - SpinP3.render(f5); - Battery1.render(f5); - Battery2.render(f5); - StockBase.render(f5); - StockTrigger.render(f5); - Shape1.render(f5); - } - - private void setRotation(ModelRenderer model, float x, float y, float z) - { - model.rotateAngleX = x; - model.rotateAngleY = y; - model.rotateAngleZ = z; - } - - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) - { - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } +public class ModelXVL1456 extends ModelBase { + // fields + ModelRenderer CoilFront; + ModelRenderer Panel1; + ModelRenderer Panel2; + ModelRenderer Panel3; + ModelRenderer CoilBack; + ModelRenderer SpinPivot; + ModelRenderer Barrel; + ModelRenderer CoilBarrel; + ModelRenderer PipeBarrel; + ModelRenderer PipeHolder; + ModelRenderer Rail1; + ModelRenderer Rail2; + ModelRenderer Rail3; + ModelRenderer Rail4; + ModelRenderer Rail5; + ModelRenderer Rail6; + ModelRenderer TankHolder; + ModelRenderer HandleBase; + ModelRenderer HandleShaft; + ModelRenderer HanldeGrip; + ModelRenderer SpinC1; + ModelRenderer SpinC2; + ModelRenderer SpinC3; + ModelRenderer SpinP1; + ModelRenderer SpinP2; + ModelRenderer SpinP3; + ModelRenderer Battery1; + ModelRenderer Battery2; + ModelRenderer StockBase; + ModelRenderer StockTrigger; + ModelRenderer Shape1; + int i = 0; + + public ModelXVL1456() { + textureWidth = 128; + textureHeight = 64; + + CoilFront = new ModelRenderer(this, 0, 0); + CoilFront.addBox(0F, 0F, 0F, 4, 10, 10); + CoilFront.setRotationPoint(0F, 0F, 0F); + CoilFront.setTextureSize(128, 64); + CoilFront.mirror = true; + setRotation(CoilFront, 0F, 0F, 0F); + Panel1 = new ModelRenderer(this, 0, 40); + Panel1.addBox(0F, 0F, 0F, 5, 11, 3); + Panel1.setRotationPoint(4F, -1F, 3.5F); + Panel1.setTextureSize(128, 64); + Panel1.mirror = true; + setRotation(Panel1, 0F, 0F, 0F); + Panel2 = new ModelRenderer(this, 0, 54); + Panel2.addBox(0F, 0F, 0F, 5, 3, 3); + Panel2.setRotationPoint(9F, -1F, 3.5F); + Panel2.setTextureSize(128, 64); + Panel2.mirror = true; + setRotation(Panel2, 0F, 0F, 0F); + Panel3 = new ModelRenderer(this, 16, 40); + Panel3.addBox(0F, 0F, 0F, 3, 11, 3); + Panel3.setRotationPoint(14F, -1F, 3.5F); + Panel3.setTextureSize(128, 64); + Panel3.mirror = true; + setRotation(Panel3, 0F, 0F, 0F); + CoilBack = new ModelRenderer(this, 0, 20); + CoilBack.addBox(0F, 0F, 0F, 4, 10, 10); + CoilBack.setRotationPoint(17F, 0F, 0F); + CoilBack.setTextureSize(128, 64); + CoilBack.mirror = true; + setRotation(CoilBack, 0F, 0F, 0F); + SpinPivot = new ModelRenderer(this, 66, 42); + SpinPivot.addBox(0F, 0F, 0F, 5, 1, 1); + SpinPivot.setRotationPoint(9F, 5.5F, 4.5F); + SpinPivot.setTextureSize(128, 64); + SpinPivot.mirror = true; + setRotation(SpinPivot, 0F, 0F, 0F); + Barrel = new ModelRenderer(this, 64, 0); + Barrel.addBox(0F, 0F, 0F, 28, 1, 1); + Barrel.setRotationPoint(-28F, 4.5F, 4.5F); + Barrel.setTextureSize(128, 64); + Barrel.mirror = true; + setRotation(Barrel, 0F, 0F, 0F); + CoilBarrel = new ModelRenderer(this, 28, 4); + CoilBarrel.addBox(0F, 0F, 0F, 9, 7, 7); + CoilBarrel.setRotationPoint(-19F, 1.5F, 1.5F); + CoilBarrel.setTextureSize(128, 64); + CoilBarrel.mirror = true; + setRotation(CoilBarrel, 0F, 0F, 0F); + PipeBarrel = new ModelRenderer(this, 28, 0); + PipeBarrel.addBox(0F, 0F, 0F, 16, 2, 2); + PipeBarrel.setRotationPoint(-13F, 6F, -0.4666667F); + PipeBarrel.setTextureSize(128, 64); + PipeBarrel.mirror = true; + setRotation(PipeBarrel, 0F, 0F, 0F); + PipeHolder = new ModelRenderer(this, 42, 37); + PipeHolder.addBox(0F, 0F, 0F, 3, 4, 1); + PipeHolder.setRotationPoint(0.5F, 5F, -1F); + PipeHolder.setTextureSize(128, 64); + PipeHolder.mirror = true; + setRotation(PipeHolder, 0F, 0F, 0F); + Rail1 = new ModelRenderer(this, 28, 27); + Rail1.addBox(0F, 0F, 0F, 1, 5, 1); + Rail1.setRotationPoint(5F, -2F, 2.5F); + Rail1.setTextureSize(128, 64); + Rail1.mirror = true; + setRotation(Rail1, 0F, 0F, 0F); + Rail2 = new ModelRenderer(this, 32, 27); + Rail2.addBox(0F, 0F, 0F, 1, 5, 1); + Rail2.setRotationPoint(5F, -2F, 6.5F); + Rail2.setTextureSize(128, 64); + Rail2.mirror = true; + setRotation(Rail2, 0F, 0F, 0F); + Rail3 = new ModelRenderer(this, 28, 23); + Rail3.addBox(0F, 0F, 0F, 18, 1, 1); + Rail3.setRotationPoint(-12F, -3F, 2.5F); + Rail3.setTextureSize(128, 64); + Rail3.mirror = true; + setRotation(Rail3, 0F, 0F, 0F); + Rail4 = new ModelRenderer(this, 28, 25); + Rail4.addBox(0F, 0F, 0F, 18, 1, 1); + Rail4.setRotationPoint(-12F, -3F, 6.5F); + Rail4.setTextureSize(128, 64); + Rail4.mirror = true; + setRotation(Rail4, 0F, 0F, 0F); + Rail5 = new ModelRenderer(this, 28, 18); + Rail5.addBox(0F, 0F, 0F, 1, 4, 1); + Rail5.setRotationPoint(-12F, -2F, 2.5F); + Rail5.setTextureSize(128, 64); + Rail5.mirror = true; + setRotation(Rail5, 0F, 0F, 0F); + Rail6 = new ModelRenderer(this, 32, 18); + Rail6.addBox(0F, 0F, 0F, 1, 4, 1); + Rail6.setRotationPoint(-12F, -2F, 6.5F); + Rail6.setTextureSize(128, 64); + Rail6.mirror = true; + setRotation(Rail6, 0F, 0F, 0F); + TankHolder = new ModelRenderer(this, 42, 27); + TankHolder.addBox(0F, 0F, 0F, 4, 2, 1); + TankHolder.setRotationPoint(4.5F, 4F, 2.5F); + TankHolder.setTextureSize(128, 64); + TankHolder.mirror = true; + setRotation(TankHolder, 0F, 0F, 0F); + HandleBase = new ModelRenderer(this, 28, 33); + HandleBase.addBox(0F, 0F, 0F, 6, 1, 1); + HandleBase.setRotationPoint(9F, -2F, 4.5F); + HandleBase.setTextureSize(128, 64); + HandleBase.mirror = true; + setRotation(HandleBase, 0F, 0F, 0F); + HandleShaft = new ModelRenderer(this, 28, 35); + HandleShaft.addBox(0F, 0F, 0F, 1, 3, 1); + HandleShaft.setRotationPoint(8F, -4F, 4.5F); + HandleShaft.setTextureSize(128, 64); + HandleShaft.mirror = true; + setRotation(HandleShaft, 0F, 0F, 0F); + HanldeGrip = new ModelRenderer(this, 28, 39); + HanldeGrip.addBox(0F, 0F, 0F, 5, 2, 2); + HanldeGrip.setRotationPoint(9F, -5F, 4F); + HanldeGrip.setTextureSize(128, 64); + HanldeGrip.mirror = true; + setRotation(HanldeGrip, 0F, 0F, 0F); + SpinC1 = new ModelRenderer(this, 66, 21); + SpinC1.addBox(0F, -3.5F, -2F, 4, 3, 4); + SpinC1.setRotationPoint(9.5F, 6F, 5F); + SpinC1.setTextureSize(128, 64); + SpinC1.mirror = true; + setRotation(SpinC1, 0F, 0F, 0F); + SpinC2 = new ModelRenderer(this, 66, 28); + SpinC2.addBox(0F, -3.5F, -2F, 4, 3, 4); + SpinC2.setRotationPoint(9.5F, 6F, 5F); + SpinC2.setTextureSize(128, 64); + SpinC2.mirror = true; + setRotation(SpinC2, 2.094395F, 0F, 0F); + SpinC3 = new ModelRenderer(this, 66, 35); + SpinC3.addBox(0F, -3.5F, -2F, 4, 3, 4); + SpinC3.setRotationPoint(9.5F, 6F, 5F); + SpinC3.setTextureSize(128, 64); + SpinC3.mirror = true; + setRotation(SpinC3, -2.094395F, 0F, 0F); + SpinP1 = new ModelRenderer(this, 82, 21); + SpinP1.addBox(0F, -3F, -1.5F, 3, 2, 3); + SpinP1.setRotationPoint(10F, 6F, 5F); + SpinP1.setTextureSize(128, 64); + SpinP1.mirror = true; + setRotation(SpinP1, 1.047198F, 0F, 0F); + SpinP2 = new ModelRenderer(this, 82, 26); + SpinP2.addBox(0F, -3F, -1.5F, 3, 2, 3); + SpinP2.setRotationPoint(10F, 6F, 5F); + SpinP2.setTextureSize(128, 64); + SpinP2.mirror = true; + setRotation(SpinP2, 3.141593F, 0F, 0F); + SpinP3 = new ModelRenderer(this, 82, 31); + SpinP3.addBox(0F, -3F, -1.5F, 3, 2, 3); + SpinP3.setRotationPoint(10F, 6F, 5F); + SpinP3.setTextureSize(128, 64); + SpinP3.mirror = true; + setRotation(SpinP3, -1.047198F, 0F, 0F); + Battery1 = new ModelRenderer(this, 64, 2); + Battery1.addBox(0F, 0F, 0F, 1, 1, 3); + Battery1.setRotationPoint(17.8F, -1F, 3.5F); + Battery1.setTextureSize(128, 64); + Battery1.mirror = true; + setRotation(Battery1, 0F, 0F, 0F); + Battery2 = new ModelRenderer(this, 72, 2); + Battery2.addBox(0F, 0F, 0F, 1, 1, 3); + Battery2.setRotationPoint(19.3F, -1F, 3.5F); + Battery2.setTextureSize(128, 64); + Battery2.mirror = true; + setRotation(Battery2, 0F, 0F, 0F); + StockBase = new ModelRenderer(this, 60, 12); + StockBase.addBox(0F, 0F, 0F, 12, 6, 3); + StockBase.setRotationPoint(22F, 7F, 3.5F); + StockBase.setTextureSize(128, 64); + StockBase.mirror = true; + setRotation(StockBase, 0F, 0F, 0F); + StockTrigger = new ModelRenderer(this, 60, 6); + StockTrigger.addBox(-3.5F, -1.5F, 0F, 5, 4, 2); + StockTrigger.setRotationPoint(22F, 10F, 4F); + StockTrigger.setTextureSize(128, 64); + StockTrigger.mirror = true; + setRotation(StockTrigger, 0F, 0F, 0.7853982F); + Shape1 = new ModelRenderer(this, 42, 30); + Shape1.addBox(0F, -1F, -1F, 2, 5, 2); + Shape1.setRotationPoint(5.5F, 6F, 2.5F); + Shape1.setTextureSize(128, 64); + Shape1.mirror = true; + setRotation(Shape1, -0.7853982F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5, float rot) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + CoilFront.render(f5); + Panel1.render(f5); + Panel2.render(f5); + Panel3.render(f5); + CoilBack.render(f5); + SpinPivot.render(f5); + Barrel.render(f5); + CoilBarrel.render(f5); + PipeBarrel.render(f5); + PipeHolder.render(f5); + Rail1.render(f5); + Rail2.render(f5); + Rail3.render(f5); + Rail4.render(f5); + Rail5.render(f5); + Rail6.render(f5); + TankHolder.render(f5); + HandleBase.render(f5); + HandleShaft.render(f5); + HanldeGrip.render(f5); + SpinC1.rotateAngleX += rot; + SpinC2.rotateAngleX += rot; + SpinC3.rotateAngleX += rot; + SpinP1.rotateAngleX += rot; + SpinP2.rotateAngleX += rot; + SpinP3.rotateAngleX += rot; + SpinC1.render(f5); + SpinC2.render(f5); + SpinC3.render(f5); + SpinP1.render(f5); + SpinP2.render(f5); + SpinP3.render(f5); + Battery1.render(f5); + Battery2.render(f5); + StockBase.render(f5); + StockTrigger.render(f5); + Shape1.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } } diff --git a/com/hbm/render/ModelZOMG.java b/com/hbm/render/ModelZOMG.java new file mode 100644 index 000000000..dac30ad59 --- /dev/null +++ b/com/hbm/render/ModelZOMG.java @@ -0,0 +1,253 @@ +// Date: 14.08.2016 18:55:34 +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + +package com.hbm.render; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelZOMG extends ModelBase { + // fields + ModelRenderer Body; + ModelRenderer BodyFront; + ModelRenderer BodyFrontPlate; + ModelRenderer PipeLeft; + ModelRenderer PipeRight; + ModelRenderer PipeBottom; + ModelRenderer Head; + ModelRenderer HeadBottom; + ModelRenderer HeadBottomPlate; + ModelRenderer BodyTop; + ModelRenderer BodyCenter; + ModelRenderer BodyBack; + ModelRenderer BodyBackPlate; + ModelRenderer StockTop; + ModelRenderer StockBack; + ModelRenderer StockBackPlate; + ModelRenderer Handle; + ModelRenderer PistonBack; + ModelRenderer PistonFront; + ModelRenderer BarrelVertical; + ModelRenderer BarrelHorizontal; + ModelRenderer BarrelCenter; + ModelRenderer HandleBack; + ModelRenderer BarrelPipe; + ModelRenderer PistonPivot; + ModelRenderer Scope; + ModelRenderer ScopePivot; + + public ModelZOMG() { + textureWidth = 128; + textureHeight = 64; + + Body = new ModelRenderer(this, 0, 0); + Body.addBox(0F, 0F, 0F, 12, 5, 4); + Body.setRotationPoint(-6F, 0F, 0F); + Body.setTextureSize(128, 64); + Body.mirror = true; + setRotation(Body, 0F, 0F, 0F); + BodyFront = new ModelRenderer(this, 32, 14); + BodyFront.addBox(0F, 0F, 0F, 1, 4, 4); + BodyFront.setRotationPoint(-7F, 0F, 0F); + BodyFront.setTextureSize(128, 64); + BodyFront.mirror = true; + setRotation(BodyFront, 0F, 0F, 0F); + BodyFrontPlate = new ModelRenderer(this, 46, 6); + BodyFrontPlate.addBox(-2F, -1F, 0F, 2, 1, 4); + BodyFrontPlate.setRotationPoint(-6F, 5F, 0F); + BodyFrontPlate.setTextureSize(128, 64); + BodyFrontPlate.mirror = true; + setRotation(BodyFrontPlate, 0F, 0F, 0.6981317F); + PipeLeft = new ModelRenderer(this, 0, 29); + PipeLeft.addBox(0F, 0F, 0F, 6, 1, 1); + PipeLeft.setRotationPoint(-13F, 0.5F, 0.5F); + PipeLeft.setTextureSize(128, 64); + PipeLeft.mirror = true; + setRotation(PipeLeft, 0F, 0F, 0F); + PipeRight = new ModelRenderer(this, 14, 29); + PipeRight.addBox(0F, 0F, 0F, 6, 1, 1); + PipeRight.setRotationPoint(-13F, 0.5F, 2.5F); + PipeRight.setTextureSize(128, 64); + PipeRight.mirror = true; + setRotation(PipeRight, 0F, 0F, 0F); + PipeBottom = new ModelRenderer(this, 14, 25); + PipeBottom.addBox(0F, 0F, 0F, 6, 2, 2); + PipeBottom.setRotationPoint(-13F, 2F, 1F); + PipeBottom.setTextureSize(128, 64); + PipeBottom.mirror = true; + setRotation(PipeBottom, 0F, 0F, 0F); + Head = new ModelRenderer(this, 32, 0); + Head.addBox(0F, 0F, 0F, 3, 4, 4); + Head.setRotationPoint(-16F, 0F, 0F); + Head.setTextureSize(128, 64); + Head.mirror = true; + setRotation(Head, 0F, 0F, 0F); + HeadBottom = new ModelRenderer(this, 46, 0); + HeadBottom.addBox(0F, 0F, 0F, 2, 2, 4); + HeadBottom.setRotationPoint(-15F, 4F, 0F); + HeadBottom.setTextureSize(128, 64); + HeadBottom.mirror = true; + setRotation(HeadBottom, 0F, 0F, 0F); + HeadBottomPlate = new ModelRenderer(this, 32, 8); + HeadBottomPlate.addBox(0F, 0F, 0F, 1, 2, 4); + HeadBottomPlate.setRotationPoint(-16F, 4F, 0F); + HeadBottomPlate.setTextureSize(128, 64); + HeadBottomPlate.mirror = true; + setRotation(HeadBottomPlate, 0F, 0F, -0.4363323F); + BodyTop = new ModelRenderer(this, 0, 17); + BodyTop.addBox(0F, 0F, 0F, 10, 1, 3); + BodyTop.setRotationPoint(-5F, -0.5F, 0.5F); + BodyTop.setTextureSize(128, 64); + BodyTop.mirror = true; + setRotation(BodyTop, 0F, 0F, 0F); + BodyCenter = new ModelRenderer(this, 0, 9); + BodyCenter.addBox(0F, 0F, 0F, 11, 3, 5); + BodyCenter.setRotationPoint(-5.5F, 1F, -0.5F); + BodyCenter.setTextureSize(128, 64); + BodyCenter.mirror = true; + setRotation(BodyCenter, 0F, 0F, 0F); + BodyBack = new ModelRenderer(this, 42, 11); + BodyBack.addBox(0F, 0F, 0F, 1, 3, 4); + BodyBack.setRotationPoint(6F, 2F, 0F); + BodyBack.setTextureSize(128, 64); + BodyBack.mirror = true; + setRotation(BodyBack, 0F, 0F, 0F); + BodyBackPlate = new ModelRenderer(this, 58, 0); + BodyBackPlate.addBox(-1F, -3F, 0F, 1, 4, 2); + BodyBackPlate.setRotationPoint(7F, 2F, 1F); + BodyBackPlate.setTextureSize(128, 64); + BodyBackPlate.mirror = true; + setRotation(BodyBackPlate, 0F, 0F, -0.4363323F); + StockTop = new ModelRenderer(this, 0, 21); + StockTop.addBox(0F, 0F, 0F, 8, 2, 2); + StockTop.setRotationPoint(7F, 3F, 1F); + StockTop.setTextureSize(128, 64); + StockTop.mirror = true; + setRotation(StockTop, 0F, 0F, 0F); + StockBack = new ModelRenderer(this, 20, 21); + StockBack.addBox(0F, 0F, 0F, 4, 2, 2); + StockBack.setRotationPoint(11F, 5F, 1F); + StockBack.setTextureSize(128, 64); + StockBack.mirror = true; + setRotation(StockBack, 0F, 0F, 0F); + StockBackPlate = new ModelRenderer(this, 0, 25); + StockBackPlate.addBox(-5F, -2F, 0F, 5, 2, 2); + StockBackPlate.setRotationPoint(11F, 7F, 1F); + StockBackPlate.setTextureSize(128, 64); + StockBackPlate.mirror = true; + setRotation(StockBackPlate, 0F, 0F, 0.418879F); + Handle = new ModelRenderer(this, 64, 8); + Handle.addBox(0F, 0F, 0F, 2, 4, 2); + Handle.setRotationPoint(-4F, 5F, 1F); + Handle.setTextureSize(128, 64); + Handle.mirror = true; + setRotation(Handle, 0F, 0F, 0F); + PistonBack = new ModelRenderer(this, 30, 26); + PistonBack.addBox(0F, -4F, 0F, 2, 4, 2); + PistonBack.setRotationPoint(1F, 4F, -0.5F); + PistonBack.setTextureSize(128, 64); + PistonBack.mirror = true; + setRotation(PistonBack, 0.7853982F, 0F, 0F); + PistonFront = new ModelRenderer(this, 52, 11); + PistonFront.addBox(0F, -4F, 0F, 2, 4, 2); + PistonFront.setRotationPoint(-3F, 4F, -0.5F); + PistonFront.setTextureSize(128, 64); + PistonFront.mirror = true; + setRotation(PistonFront, 0.7853982F, 0F, 0F); + BarrelVertical = new ModelRenderer(this, 38, 22); + BarrelVertical.addBox(0F, 0F, 0F, 8, 3, 2); + BarrelVertical.setRotationPoint(-4F, 1F, 5F); + BarrelVertical.setTextureSize(128, 64); + BarrelVertical.mirror = true; + setRotation(BarrelVertical, 0F, 0F, 0F); + BarrelHorizontal = new ModelRenderer(this, 38, 27); + BarrelHorizontal.addBox(0F, 0F, 0F, 8, 2, 3); + BarrelHorizontal.setRotationPoint(-4F, 1.5F, 4.5F); + BarrelHorizontal.setTextureSize(128, 64); + BarrelHorizontal.mirror = true; + setRotation(BarrelHorizontal, 0F, 0F, 0F); + BarrelCenter = new ModelRenderer(this, 64, 0); + BarrelCenter.addBox(0F, 0F, 0F, 10, 2, 2); + BarrelCenter.setRotationPoint(-5F, 1.5F, 5F); + BarrelCenter.setTextureSize(128, 64); + BarrelCenter.mirror = true; + setRotation(BarrelCenter, 0F, 0F, 0F); + HandleBack = new ModelRenderer(this, 60, 8); + HandleBack.addBox(0F, 0F, 0F, 1, 4, 1); + HandleBack.setRotationPoint(-2.5F, 5F, 1.5F); + HandleBack.setTextureSize(128, 64); + HandleBack.mirror = true; + setRotation(HandleBack, 0F, 0F, 0F); + BarrelPipe = new ModelRenderer(this, 64, 4); + BarrelPipe.addBox(-10F, 0F, -1F, 10, 1, 1); + BarrelPipe.setRotationPoint(-5F, 2F, 6.5F); + BarrelPipe.setTextureSize(128, 64); + BarrelPipe.mirror = true; + setRotation(BarrelPipe, 0F, -0.2602503F, 0F); + PistonPivot = new ModelRenderer(this, 60, 14); + PistonPivot.addBox(0F, -2F, 0.5F, 7, 2, 1); + PistonPivot.setRotationPoint(-3.5F, 4F, -0.5F); + PistonPivot.setTextureSize(128, 64); + PistonPivot.mirror = true; + setRotation(PistonPivot, 0.7853982F, 0F, 0F); + Scope = new ModelRenderer(this, 48, 18); + Scope.addBox(0F, 0F, 0F, 6, 2, 2); + Scope.setRotationPoint(-3F, -3F, 1F); + Scope.setTextureSize(128, 64); + Scope.mirror = true; + setRotation(Scope, 0F, 0F, 0F); + ScopePivot = new ModelRenderer(this, 58, 6); + ScopePivot.addBox(0F, 0F, 0F, 4, 1, 1); + ScopePivot.setRotationPoint(-2F, -1F, 1.5F); + ScopePivot.setTextureSize(128, 64); + ScopePivot.mirror = true; + setRotation(ScopePivot, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5, entity); + Body.render(f5); + BodyFront.render(f5); + BodyFrontPlate.render(f5); + PipeLeft.render(f5); + PipeRight.render(f5); + PipeBottom.render(f5); + Head.render(f5); + HeadBottom.render(f5); + HeadBottomPlate.render(f5); + BodyTop.render(f5); + BodyCenter.render(f5); + BodyBack.render(f5); + BodyBackPlate.render(f5); + StockTop.render(f5); + StockBack.render(f5); + StockBackPlate.render(f5); + Handle.render(f5); + PistonBack.render(f5); + PistonFront.render(f5); + BarrelVertical.render(f5); + BarrelHorizontal.render(f5); + BarrelCenter.render(f5); + HandleBack.render(f5); + BarrelPipe.render(f5); + PistonPivot.render(f5); + Scope.render(f5); + ScopePivot.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { + super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); + } + +} diff --git a/com/hbm/render/RenderCable.java b/com/hbm/render/RenderCable.java index c5f91a956..f74402b1e 100644 --- a/com/hbm/render/RenderCable.java +++ b/com/hbm/render/RenderCable.java @@ -2,8 +2,8 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.TileEntityCable; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityCable; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/RenderCloudFleija.java b/com/hbm/render/RenderCloudFleija.java new file mode 100644 index 000000000..cf901fc46 --- /dev/null +++ b/com/hbm/render/RenderCloudFleija.java @@ -0,0 +1,59 @@ +package com.hbm.render; + +import java.util.Random; + +import org.lwjgl.opengl.GL11; + +import com.hbm.entity.EntityCloudFleija; +import com.hbm.entity.EntityNukeCloudBig; +import com.hbm.lib.RefStrings; + +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; + +public class RenderCloudFleija extends Render { + + private static final ResourceLocation objTesterModelRL = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/Sphere.obj"); + private IModelCustom blastModel; + private ResourceLocation blastTexture; + public float scale = 0; + public float ring = 0; + + public RenderCloudFleija() { + blastModel = AdvancedModelLoader.loadModel(objTesterModelRL); + blastTexture = new ResourceLocation(RefStrings.MODID, "textures/models/BlastFleija.png"); + scale = 0; + } + + @Override + public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + render((EntityCloudFleija)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); + } + + public void render(EntityCloudFleija cloud, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + GL11.glPushMatrix(); + GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + //if(cloud.age < 150) + { + //GL11.glTranslatef(0.0F, -60F + ((p_76986_1_.age - 100) * 60 / 50), 0.0F); + GL11.glTranslatef(0.0F, 0.0F, 0.0F); + } + GL11.glScalef(cloud.age, cloud.age, cloud.age); + + bindTexture(blastTexture); + blastModel.renderAll(); + GL11.glPopMatrix(); + } + + @Override + protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + return null; + } +} diff --git a/com/hbm/render/RenderDecoBlockAlt.java b/com/hbm/render/RenderDecoBlockAlt.java index c82ab05d5..656c9ac1d 100644 --- a/com/hbm/render/RenderDecoBlockAlt.java +++ b/com/hbm/render/RenderDecoBlockAlt.java @@ -2,11 +2,11 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.TileEntityDecoBlockAltF; -import com.hbm.blocks.TileEntityDecoBlockAltG; -import com.hbm.blocks.TileEntityDecoBlockAltW; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityDecoBlockAltF; +import com.hbm.tileentity.TileEntityDecoBlockAltG; +import com.hbm.tileentity.TileEntityDecoBlockAltW; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/com/hbm/render/RenderLaunchPadTier1.java b/com/hbm/render/RenderLaunchPadTier1.java index 009768488..c2b370f0e 100644 --- a/com/hbm/render/RenderLaunchPadTier1.java +++ b/com/hbm/render/RenderLaunchPadTier1.java @@ -2,8 +2,8 @@ package com.hbm.render; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.TileEntityLaunchPad; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityLaunchPad; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/RenderTestContainer.java b/com/hbm/render/RenderTestContainer.java index 5ab7fe3e0..dc8c78946 100644 --- a/com/hbm/render/RenderTestContainer.java +++ b/com/hbm/render/RenderTestContainer.java @@ -17,8 +17,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.blocks.TestContainer; -import com.hbm.blocks.TileEntityTestContainer; import com.hbm.lib.RefStrings; +import com.hbm.tileentity.TileEntityTestContainer; @SideOnly(Side.CLIENT) public class RenderTestContainer extends TileEntitySpecialRenderer diff --git a/com/hbm/blocks/TileEntityBombMulti.java b/com/hbm/tileentity/TileEntityBombMulti.java similarity index 99% rename from com/hbm/blocks/TileEntityBombMulti.java rename to com/hbm/tileentity/TileEntityBombMulti.java index af4fefff3..abeff2355 100644 --- a/com/hbm/blocks/TileEntityBombMulti.java +++ b/com/hbm/tileentity/TileEntityBombMulti.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityCable.java b/com/hbm/tileentity/TileEntityCable.java similarity index 98% rename from com/hbm/blocks/TileEntityCable.java rename to com/hbm/tileentity/TileEntityCable.java index f2efbb0ac..20c681bb1 100644 --- a/com/hbm/blocks/TileEntityCable.java +++ b/com/hbm/tileentity/TileEntityCable.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/blocks/TileEntityConverterHeRf.java b/com/hbm/tileentity/TileEntityConverterHeRf.java similarity index 99% rename from com/hbm/blocks/TileEntityConverterHeRf.java rename to com/hbm/tileentity/TileEntityConverterHeRf.java index 6a30a4b55..b94a6f227 100644 --- a/com/hbm/blocks/TileEntityConverterHeRf.java +++ b/com/hbm/tileentity/TileEntityConverterHeRf.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.calc.Location; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityConverterRfHe.java b/com/hbm/tileentity/TileEntityConverterRfHe.java similarity index 99% rename from com/hbm/blocks/TileEntityConverterRfHe.java rename to com/hbm/tileentity/TileEntityConverterRfHe.java index c0fe3b561..6b5ccafb4 100644 --- a/com/hbm/blocks/TileEntityConverterRfHe.java +++ b/com/hbm/tileentity/TileEntityConverterRfHe.java @@ -1,8 +1,9 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityCoreAdvanced.java b/com/hbm/tileentity/TileEntityCoreAdvanced.java similarity index 99% rename from com/hbm/blocks/TileEntityCoreAdvanced.java rename to com/hbm/tileentity/TileEntityCoreAdvanced.java index 6e2c4e201..701e1c3ff 100644 --- a/com/hbm/blocks/TileEntityCoreAdvanced.java +++ b/com/hbm/tileentity/TileEntityCoreAdvanced.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFactory; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityCoreTitanium.java b/com/hbm/tileentity/TileEntityCoreTitanium.java similarity index 99% rename from com/hbm/blocks/TileEntityCoreTitanium.java rename to com/hbm/tileentity/TileEntityCoreTitanium.java index 780c83a8a..8f3026fac 100644 --- a/com/hbm/blocks/TileEntityCoreTitanium.java +++ b/com/hbm/tileentity/TileEntityCoreTitanium.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFactory; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityCrashedBomb.java b/com/hbm/tileentity/TileEntityCrashedBomb.java similarity index 89% rename from com/hbm/blocks/TileEntityCrashedBomb.java rename to com/hbm/tileentity/TileEntityCrashedBomb.java index 40e10a751..3f4d21043 100644 --- a/com/hbm/blocks/TileEntityCrashedBomb.java +++ b/com/hbm/tileentity/TileEntityCrashedBomb.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityDecoBlock.java b/com/hbm/tileentity/TileEntityDecoBlock.java similarity index 89% rename from com/hbm/blocks/TileEntityDecoBlock.java rename to com/hbm/tileentity/TileEntityDecoBlock.java index 1c3551230..084f6e616 100644 --- a/com/hbm/blocks/TileEntityDecoBlock.java +++ b/com/hbm/tileentity/TileEntityDecoBlock.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityDecoBlockAlt.java b/com/hbm/tileentity/TileEntityDecoBlockAlt.java similarity index 90% rename from com/hbm/blocks/TileEntityDecoBlockAlt.java rename to com/hbm/tileentity/TileEntityDecoBlockAlt.java index f2be5a9c8..2d1674fff 100644 --- a/com/hbm/blocks/TileEntityDecoBlockAlt.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAlt.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityDecoBlockAltF.java b/com/hbm/tileentity/TileEntityDecoBlockAltF.java similarity index 98% rename from com/hbm/blocks/TileEntityDecoBlockAltF.java rename to com/hbm/tileentity/TileEntityDecoBlockAltF.java index 0f8c6cb60..8d9c48015 100644 --- a/com/hbm/blocks/TileEntityDecoBlockAltF.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltF.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.HashSet; import java.util.List; diff --git a/com/hbm/blocks/TileEntityDecoBlockAltG.java b/com/hbm/tileentity/TileEntityDecoBlockAltG.java similarity index 90% rename from com/hbm/blocks/TileEntityDecoBlockAltG.java rename to com/hbm/tileentity/TileEntityDecoBlockAltG.java index 0041ae5f1..8207a701a 100644 --- a/com/hbm/blocks/TileEntityDecoBlockAltG.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltG.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityDecoBlockAltW.java b/com/hbm/tileentity/TileEntityDecoBlockAltW.java similarity index 90% rename from com/hbm/blocks/TileEntityDecoBlockAltW.java rename to com/hbm/tileentity/TileEntityDecoBlockAltW.java index 70b570024..df735af34 100644 --- a/com/hbm/blocks/TileEntityDecoBlockAltW.java +++ b/com/hbm/tileentity/TileEntityDecoBlockAltW.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityDecoPoleSatelliteReceiver.java b/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java similarity index 80% rename from com/hbm/blocks/TileEntityDecoPoleSatelliteReceiver.java rename to com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java index 28277f11e..604a2dee0 100644 --- a/com/hbm/blocks/TileEntityDecoPoleSatelliteReceiver.java +++ b/com/hbm/tileentity/TileEntityDecoPoleSatelliteReceiver.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityDecoPoleTop.java b/com/hbm/tileentity/TileEntityDecoPoleTop.java similarity index 78% rename from com/hbm/blocks/TileEntityDecoPoleTop.java rename to com/hbm/tileentity/TileEntityDecoPoleTop.java index e3365803a..05aed17ea 100644 --- a/com/hbm/blocks/TileEntityDecoPoleTop.java +++ b/com/hbm/tileentity/TileEntityDecoPoleTop.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityDecoSteelPoles.java b/com/hbm/tileentity/TileEntityDecoSteelPoles.java similarity index 79% rename from com/hbm/blocks/TileEntityDecoSteelPoles.java rename to com/hbm/tileentity/TileEntityDecoSteelPoles.java index 278256468..a5b7706b2 100644 --- a/com/hbm/blocks/TileEntityDecoSteelPoles.java +++ b/com/hbm/tileentity/TileEntityDecoSteelPoles.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityDecoTapeRecorder.java b/com/hbm/tileentity/TileEntityDecoTapeRecorder.java similarity index 87% rename from com/hbm/blocks/TileEntityDecoTapeRecorder.java rename to com/hbm/tileentity/TileEntityDecoTapeRecorder.java index a4b8c8a9c..657efdb45 100644 --- a/com/hbm/blocks/TileEntityDecoTapeRecorder.java +++ b/com/hbm/tileentity/TileEntityDecoTapeRecorder.java @@ -1,4 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; + +import com.hbm.blocks.DecoTapeRecorder; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityDiFurnace.java b/com/hbm/tileentity/TileEntityDiFurnace.java similarity index 99% rename from com/hbm/blocks/TileEntityDiFurnace.java rename to com/hbm/tileentity/TileEntityDiFurnace.java index 17abe2ba8..73c3f54d1 100644 --- a/com/hbm/blocks/TileEntityDiFurnace.java +++ b/com/hbm/tileentity/TileEntityDiFurnace.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.MachineDiFurnace; import com.hbm.gui.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityFusionMultiblock.java b/com/hbm/tileentity/TileEntityFusionMultiblock.java similarity index 99% rename from com/hbm/blocks/TileEntityFusionMultiblock.java rename to com/hbm/tileentity/TileEntityFusionMultiblock.java index ffd2f3ca4..6e3fddb01 100644 --- a/com/hbm/blocks/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/TileEntityFusionMultiblock.java @@ -1,8 +1,9 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityLaunchPad.java b/com/hbm/tileentity/TileEntityLaunchPad.java similarity index 99% rename from com/hbm/blocks/TileEntityLaunchPad.java rename to com/hbm/tileentity/TileEntityLaunchPad.java index 198ffbf34..a07fe4743 100644 --- a/com/hbm/blocks/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/TileEntityLaunchPad.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.LaunchPad; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityMachineBattery.java b/com/hbm/tileentity/TileEntityMachineBattery.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineBattery.java rename to com/hbm/tileentity/TileEntityMachineBattery.java index b8521393f..c754afde9 100644 --- a/com/hbm/blocks/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/TileEntityMachineBattery.java @@ -1,8 +1,9 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/tileentity/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/TileEntityMachineCMBFactory.java new file mode 100644 index 000000000..61e40b2d4 --- /dev/null +++ b/com/hbm/tileentity/TileEntityMachineCMBFactory.java @@ -0,0 +1,297 @@ +package com.hbm.tileentity; + +import com.hbm.interfaces.IConsumer; +import com.hbm.items.ItemBattery; +import com.hbm.items.ModItems; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +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 TileEntityMachineCMBFactory extends TileEntity implements ISidedInventory, IConsumer { + + private ItemStack slots[]; + + public int power = 0; + public int waste = 0; + public int process = 0; + public static final int maxFill = 1000; + public static final int maxPower = 10000; + public static final int processSpeed = 200; + + private static final int[] slots_top = new int[] {3}; + private static final int[] slots_bottom = new int[] {4, 0, 1}; + private static final int[] slots_side = new int[] {0, 1, 2}; + + private String customName; + + public TileEntityMachineCMBFactory() { + slots = new ItemStack[5]; + } + + @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.machine_deuterium"; + } + + @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; + } + } + + @Override + public void openInventory() {} + @Override + public void closeInventory() {} + + @Override + public boolean isItemValidForSlot(int i, ItemStack stack) { + switch(i) + { + case 0: + if(stack.getItem() instanceof ItemBattery) + return true; + break; + case 1: + if(stack.getItem() == ModItems.rod_water || stack.getItem() == ModItems.rod_dual_water || stack.getItem() == ModItems.rod_quad_water || stack.getItem() == Items.water_bucket) + return true; + break; + case 2: + if(stack.getItem() == ModItems.sulfur) + return true; + break; + case 3: + if(stack.getItem() == ModItems.cell_empty) + return true; + break; + } + + 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); + + power = nbt.getShort("power"); + waste = nbt.getShort("waste"); + process = nbt.getShort("process"); + 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.setShort("power", (short) power); + nbt.setShort("waste", (short) waste); + nbt.setShort("process", (short) process); + 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 + public int[] getAccessibleSlotsFromSide(int p_94128_1_) + { + 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 == 4) + return true; + if(i == 0 && itemStack.getItem() instanceof ItemBattery) + if(itemStack.getItemDamage() == itemStack.getMaxDamage()) + return true; + if(i == 1) + if(itemStack.getItem() == Items.bucket || itemStack.getItem() == ModItems.rod_empty || itemStack.getItem() == ModItems.rod_dual_empty || itemStack.getItem() == ModItems.rod_quad_empty) + return true; + + return false; + } + + public int getPowerScaled(int i) { + return (power * i) / maxPower; + } + + public int getWasteScaled(int i) { + return (waste * i) / maxFill; + } + + public int getProgressScaled(int i) { + return (process * i) / processSpeed; + } + + public boolean canProcess() { + return false; + } + + public boolean isProcessing() { + return process > 0; + } + + public void process() { + waste -= 1; + power -= 25; + + process++; + + if(process >= processSpeed) { + + slots[3].stackSize--; + + if(slots[3].stackSize == 0) + { + slots[3] = null; + } + + if(slots[4] == null) + { + slots[4] = new ItemStack(ModItems.cell_deuterium); + } else { + + slots[4].stackSize++; + } + + process = 0; + } + } + + @Override + public void updateEntity() { + + if (!worldObj.isRemote) { + + if (power + 100 <= maxPower && slots[0] != null && slots[0].getItem() == ModItems.energy_core + && slots[0].getItemDamage() < 5000) { + power += 100; + slots[0].setItemDamage(slots[0].getItemDamage() + 1); + } + + if (canProcess()) { + process(); + } else { + process = 0; + } + } + } + + @Override + public void setPower(int i) { + power = i; + + } + + @Override + public int getPower() { + return power; + + } + + @Override + public int getMaxPower() { + return maxPower; + } +} diff --git a/com/hbm/blocks/TileEntityMachineCentrifuge.java b/com/hbm/tileentity/TileEntityMachineCentrifuge.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineCentrifuge.java rename to com/hbm/tileentity/TileEntityMachineCentrifuge.java index 145950657..6b0382677 100644 --- a/com/hbm/blocks/TileEntityMachineCentrifuge.java +++ b/com/hbm/tileentity/TileEntityMachineCentrifuge.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.gui.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityMachineCoal.java b/com/hbm/tileentity/TileEntityMachineCoal.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineCoal.java rename to com/hbm/tileentity/TileEntityMachineCoal.java index 486059214..8745e9e70 100644 --- a/com/hbm/blocks/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/TileEntityMachineCoal.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +14,8 @@ import net.minecraft.tileentity.TileEntity; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.MachineCoal; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityMachineDeuterium.java b/com/hbm/tileentity/TileEntityMachineDeuterium.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineDeuterium.java rename to com/hbm/tileentity/TileEntityMachineDeuterium.java index 980037080..8cbec0898 100644 --- a/com/hbm/blocks/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/TileEntityMachineDeuterium.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityMachineDiesel.java b/com/hbm/tileentity/TileEntityMachineDiesel.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineDiesel.java rename to com/hbm/tileentity/TileEntityMachineDiesel.java index 0e830f2f3..33ba1788c 100644 --- a/com/hbm/blocks/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/TileEntityMachineDiesel.java @@ -1,8 +1,9 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineElectricFurnace.java rename to com/hbm/tileentity/TileEntityMachineElectricFurnace.java index f64aee638..a6bdfc8eb 100644 --- a/com/hbm/blocks/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.MachineElectricFurnace; import com.hbm.gui.MachineRecipes; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; diff --git a/com/hbm/blocks/TileEntityMachineGenerator.java b/com/hbm/tileentity/TileEntityMachineGenerator.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineGenerator.java rename to com/hbm/tileentity/TileEntityMachineGenerator.java index 7c93684c6..cf73c9273 100644 --- a/com/hbm/blocks/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineGenerator.java @@ -1,9 +1,11 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.hbm.blocks.MachineGenerator; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.interfaces.IConductor; diff --git a/com/hbm/blocks/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java similarity index 99% rename from com/hbm/blocks/TileEntityMachinePuF6Tank.java rename to com/hbm/tileentity/TileEntityMachinePuF6Tank.java index c73114b4c..e464b1b4c 100644 --- a/com/hbm/blocks/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityMachineReactor.java b/com/hbm/tileentity/TileEntityMachineReactor.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineReactor.java rename to com/hbm/tileentity/TileEntityMachineReactor.java index 48ae1cf30..6612fe5d2 100644 --- a/com/hbm/blocks/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/TileEntityMachineReactor.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.gui.MachineRecipes; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityMachineSchrabidiumTransmutator.java b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineSchrabidiumTransmutator.java rename to com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java index 6e4646f16..5d84f6402 100644 --- a/com/hbm/blocks/TileEntityMachineSchrabidiumTransmutator.java +++ b/com/hbm/tileentity/TileEntityMachineSchrabidiumTransmutator.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.Random; diff --git a/com/hbm/blocks/TileEntityMachineShredder.java b/com/hbm/tileentity/TileEntityMachineShredder.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineShredder.java rename to com/hbm/tileentity/TileEntityMachineShredder.java index ee239cbe0..c3a95dde0 100644 --- a/com/hbm/blocks/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/TileEntityMachineShredder.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/blocks/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/TileEntityMachineUF6Tank.java similarity index 99% rename from com/hbm/blocks/TileEntityMachineUF6Tank.java rename to com/hbm/tileentity/TileEntityMachineUF6Tank.java index 267747a59..cc4b1ded9 100644 --- a/com/hbm/blocks/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachineUF6Tank.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeBoy.java b/com/hbm/tileentity/TileEntityNukeBoy.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeBoy.java rename to com/hbm/tileentity/TileEntityNukeBoy.java index 255d89333..a58b4ad28 100644 --- a/com/hbm/blocks/TileEntityNukeBoy.java +++ b/com/hbm/tileentity/TileEntityNukeBoy.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeFleija.java b/com/hbm/tileentity/TileEntityNukeFleija.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeFleija.java rename to com/hbm/tileentity/TileEntityNukeFleija.java index 0d1e1a312..d4cd00b56 100644 --- a/com/hbm/blocks/TileEntityNukeFleija.java +++ b/com/hbm/tileentity/TileEntityNukeFleija.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeFurnace.java b/com/hbm/tileentity/TileEntityNukeFurnace.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeFurnace.java rename to com/hbm/tileentity/TileEntityNukeFurnace.java index cbc71870e..3e2958b6b 100644 --- a/com/hbm/blocks/TileEntityNukeFurnace.java +++ b/com/hbm/tileentity/TileEntityNukeFurnace.java @@ -1,5 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; +import com.hbm.blocks.MachineNukeFurnace; import com.hbm.items.ItemCustomLore; import com.hbm.items.ItemFuelRod; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeGadget.java b/com/hbm/tileentity/TileEntityNukeGadget.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeGadget.java rename to com/hbm/tileentity/TileEntityNukeGadget.java index 874930a83..a47b52cc7 100644 --- a/com/hbm/blocks/TileEntityNukeGadget.java +++ b/com/hbm/tileentity/TileEntityNukeGadget.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeMan.java b/com/hbm/tileentity/TileEntityNukeMan.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeMan.java rename to com/hbm/tileentity/TileEntityNukeMan.java index 78dc1cb03..2ad7a12e0 100644 --- a/com/hbm/blocks/TileEntityNukeMan.java +++ b/com/hbm/tileentity/TileEntityNukeMan.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeMike.java b/com/hbm/tileentity/TileEntityNukeMike.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeMike.java rename to com/hbm/tileentity/TileEntityNukeMike.java index d798f29b7..e656765bb 100644 --- a/com/hbm/blocks/TileEntityNukeMike.java +++ b/com/hbm/tileentity/TileEntityNukeMike.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukePrototype.java b/com/hbm/tileentity/TileEntityNukePrototype.java similarity index 99% rename from com/hbm/blocks/TileEntityNukePrototype.java rename to com/hbm/tileentity/TileEntityNukePrototype.java index b48c21c6f..57661a05e 100644 --- a/com/hbm/blocks/TileEntityNukePrototype.java +++ b/com/hbm/tileentity/TileEntityNukePrototype.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityNukeTsar.java b/com/hbm/tileentity/TileEntityNukeTsar.java similarity index 99% rename from com/hbm/blocks/TileEntityNukeTsar.java rename to com/hbm/tileentity/TileEntityNukeTsar.java index 68561776b..a5c727f5b 100644 --- a/com/hbm/blocks/TileEntityNukeTsar.java +++ b/com/hbm/tileentity/TileEntityNukeTsar.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityObjTester.java b/com/hbm/tileentity/TileEntityObjTester.java similarity index 94% rename from com/hbm/blocks/TileEntityObjTester.java rename to com/hbm/tileentity/TileEntityObjTester.java index 4008e7f92..595f7931e 100644 --- a/com/hbm/blocks/TileEntityObjTester.java +++ b/com/hbm/tileentity/TileEntityObjTester.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/blocks/TileEntityReactorMultiblock.java b/com/hbm/tileentity/TileEntityReactorMultiblock.java similarity index 99% rename from com/hbm/blocks/TileEntityReactorMultiblock.java rename to com/hbm/tileentity/TileEntityReactorMultiblock.java index 4b6a65ef1..d95bc8b46 100644 --- a/com/hbm/blocks/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/TileEntityReactorMultiblock.java @@ -1,10 +1,12 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Random; +import com.hbm.blocks.MachineGenerator; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.entity.EntityNuclearCreeper; import com.hbm.entity.EntityNukeCloudSmall; diff --git a/com/hbm/blocks/TileEntityRedBarrel.java b/com/hbm/tileentity/TileEntityRedBarrel.java similarity index 78% rename from com/hbm/blocks/TileEntityRedBarrel.java rename to com/hbm/tileentity/TileEntityRedBarrel.java index 071fa250b..013bd4983 100644 --- a/com/hbm/blocks/TileEntityRedBarrel.java +++ b/com/hbm/tileentity/TileEntityRedBarrel.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityRotationTester.java b/com/hbm/tileentity/TileEntityRotationTester.java similarity index 92% rename from com/hbm/blocks/TileEntityRotationTester.java rename to com/hbm/tileentity/TileEntityRotationTester.java index 2a99b0c25..a5a84b4f2 100644 --- a/com/hbm/blocks/TileEntityRotationTester.java +++ b/com/hbm/tileentity/TileEntityRotationTester.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityRtgFurnace.java b/com/hbm/tileentity/TileEntityRtgFurnace.java similarity index 98% rename from com/hbm/blocks/TileEntityRtgFurnace.java rename to com/hbm/tileentity/TileEntityRtgFurnace.java index 9b6e8618d..b3ab13bc5 100644 --- a/com/hbm/blocks/TileEntityRtgFurnace.java +++ b/com/hbm/tileentity/TileEntityRtgFurnace.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import com.hbm.blocks.MachineRtgFurnace; import com.hbm.items.ModItems; public class TileEntityRtgFurnace extends TileEntity implements ISidedInventory { diff --git a/com/hbm/blocks/TileEntityTestBombAdvanced.java b/com/hbm/tileentity/TileEntityTestBombAdvanced.java similarity index 79% rename from com/hbm/blocks/TileEntityTestBombAdvanced.java rename to com/hbm/tileentity/TileEntityTestBombAdvanced.java index 088efeae1..56a6fb380 100644 --- a/com/hbm/blocks/TileEntityTestBombAdvanced.java +++ b/com/hbm/tileentity/TileEntityTestBombAdvanced.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityTestContainer.java b/com/hbm/tileentity/TileEntityTestContainer.java similarity index 98% rename from com/hbm/blocks/TileEntityTestContainer.java rename to com/hbm/tileentity/TileEntityTestContainer.java index 55c844945..25c42aaf2 100644 --- a/com/hbm/blocks/TileEntityTestContainer.java +++ b/com/hbm/tileentity/TileEntityTestContainer.java @@ -1,4 +1,6 @@ -package com.hbm.blocks; +package com.hbm.tileentity; + +import com.hbm.blocks.TestContainer; import net.minecraft.block.Block; import net.minecraft.block.BlockChest; diff --git a/com/hbm/blocks/TileEntityTestNuke.java b/com/hbm/tileentity/TileEntityTestNuke.java similarity index 99% rename from com/hbm/blocks/TileEntityTestNuke.java rename to com/hbm/tileentity/TileEntityTestNuke.java index 6dd9f1f86..e93acb914 100644 --- a/com/hbm/blocks/TileEntityTestNuke.java +++ b/com/hbm/tileentity/TileEntityTestNuke.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import com.hbm.items.ModItems; diff --git a/com/hbm/blocks/TileEntityTestRender.java b/com/hbm/tileentity/TileEntityTestRender.java similarity index 78% rename from com/hbm/blocks/TileEntityTestRender.java rename to com/hbm/tileentity/TileEntityTestRender.java index 74ba7869a..7abd81970 100644 --- a/com/hbm/blocks/TileEntityTestRender.java +++ b/com/hbm/tileentity/TileEntityTestRender.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/TileEntityWatzCore.java b/com/hbm/tileentity/TileEntityWatzCore.java similarity index 99% rename from com/hbm/blocks/TileEntityWatzCore.java rename to com/hbm/tileentity/TileEntityWatzCore.java index 50b5aff4b..5a16b6ade 100644 --- a/com/hbm/blocks/TileEntityWatzCore.java +++ b/com/hbm/tileentity/TileEntityWatzCore.java @@ -1,9 +1,10 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.entity.EntityNukeExplosionAdvanced; import com.hbm.interfaces.IConductor; diff --git a/com/hbm/blocks/TileEntityWireCoated.java b/com/hbm/tileentity/TileEntityWireCoated.java similarity index 93% rename from com/hbm/blocks/TileEntityWireCoated.java rename to com/hbm/tileentity/TileEntityWireCoated.java index a2fd7f8bd..995152e93 100644 --- a/com/hbm/blocks/TileEntityWireCoated.java +++ b/com/hbm/tileentity/TileEntityWireCoated.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; diff --git a/com/hbm/blocks/TileEntityYellowBarrel.java b/com/hbm/tileentity/TileEntityYellowBarrel.java similarity index 99% rename from com/hbm/blocks/TileEntityYellowBarrel.java rename to com/hbm/tileentity/TileEntityYellowBarrel.java index db6e4bc8c..1cd61f181 100644 --- a/com/hbm/blocks/TileEntityYellowBarrel.java +++ b/com/hbm/tileentity/TileEntityYellowBarrel.java @@ -1,4 +1,4 @@ -package com.hbm.blocks; +package com.hbm.tileentity; import java.util.HashSet; import java.util.List; diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index d2bd99beb..135ac69d2 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -5,10 +5,10 @@ package com.hbm.world; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.TileEntityMachinePuF6Tank; -import com.hbm.blocks.TileEntityMachineUF6Tank; import com.hbm.lib.HbmChestContents; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityMachinePuF6Tank; +import com.hbm.tileentity.TileEntityMachineUF6Tank; import net.minecraft.block.Block; import net.minecraft.init.Blocks;