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

biscuits

Browse Source
This commit is contained in:
Bob 2020-12-27 17:43:12 +01:00
parent 7159f83d2d
commit c2eac4f3e4
29 changed files with 185 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/assets/hbm/lang/de_DE.lang
View File

@ -587,6 +587,7 @@ item.battery_steam_large.name=Großer dampfbetriebener Energiespeichertank
item.battery_su.name=Einwegbatterie
item.battery_su_l.name=Große Einwegbatterie
item.battery_trixite.name=Billige Spark-Batterie-Nachmache
item.beta.name=Beta-Features
item.big_sword.name=Großes Schwert
item.biomass.name=Biomasse
item.biomass_compressed.name=Verdichtete Biomasse
@ -700,6 +701,7 @@ item.canned_tube.name=Tube (Astronautenessen)
item.canned_tuna.name=Konservendose (Tunfisch)
item.canned_yogurt.name=Konservendose (Jogurt)
item.canteen_13.name=Vault 13 Kantine
item.canteen_fab.name=Fabulöser Wodka
item.canteen_vodka.name=Stylischer Flachmann
item.cap_aluminium.name=Aluminiumdeckel
item.cap_fritz.name=Fritz-Kola Kronkorken
@ -1284,12 +1286,16 @@ item.mese_pickaxe.name=Mesespitzhacke
item.meteor_remote.name=Meteoritenkontroller
item.meteorite_sword.name=Meteoritenschwert
item.meteorite_sword_seared.name=Meteoritenschwert (Versengt)
item.meteorite_sword_reforged.name=Meteorite Sword (Nachgeschmiedet)
item.meteorite_sword_hardened.name=Meteorite Sword (Gehärtet)
item.meteorite_sword_alloyed.name=Meteorite Sword (Legiert)
item.meteorite_sword_machined.name=Meteorite Sword (Maschninenverarbeitet)
item.meteorite_sword_treated.name=Meteorite Sword (Behandelt)
item.meteorite_sword_etched.name=Meteorite Sword (Geätzt)
item.meteorite_sword_reforged.name=Meteoritenschwert (Nachgeschmiedet)
item.meteorite_sword_hardened.name=Meteoritenschwert (Gehärtet)
item.meteorite_sword_alloyed.name=Meteoritenschwert (Legiert)
item.meteorite_sword_machined.name=Meteoritenschwert (Maschninenverarbeitet)
item.meteorite_sword_treated.name=Meteoritenschwert (Behandelt)
item.meteorite_sword_etched.name=Meteoritenschwert (Geätzt)
item.meteorite_sword_bred.name=Meteoritenschwert (Gebrütet)
item.meteorite_sword_irradiated.name=Meteoritenschwert (Bestrahlt)
item.meteorite_sword_fused.name=Meteoritenschwert (Fusioniert)
item.meteorite_sword_baleful.name=Meteoritenschwert (Unheilvoll)
item.mike_cooling_unit.name=Deuteriumkühleinheit
item.mike_core.name=Mit Uran ummantelter Deuteriumtank
item.mike_deut.name=Deuteriumtank
@ -2420,6 +2426,7 @@ tile.mine_fat.name=Fatmine
tile.mine_he.name=Antipanzermine
tile.mine_shrap.name=Schrapnellmine
tile.mud_block.name=Giftiger Schlamm
tile.muffler.name=Schalldämpfer
tile.mush.name=Leuchtender Pilz
tile.ntm_dirt.name=Erde
tile.nuke_boy.name=Little Boy

9
src/main/java/assets/hbm/lang/en_US.lang
View File

@ -587,6 +587,7 @@ item.battery_steam_large.name=Large Steam Powered Energy Storage Tank
item.battery_su.name=SU-Battery
item.battery_su_l.name=Large SU-Battery
item.battery_trixite.name=Off-Brand Spark Battery
item.beta.name=Beta Features
item.big_sword.name=Great Sword
item.biomass.name=Biomass
item.biomass_compressed.name=Compressed Biomass
@ -700,6 +701,7 @@ item.canned_tube.name=Astronaut Food Tube
item.canned_tuna.name=Canned Tuna
item.canned_yogurt.name=Canned Yogurt
item.canteen_13.name=Vault 13 Canteen
item.canteen_fab.name=Fabulous Vodka
item.canteen_vodka.name=Stylish Flask
item.cap_aluminium.name=Aluminium Cap
item.cap_fritz.name=Fritz Cola Bottle Cap
@ -1290,8 +1292,10 @@ item.meteorite_sword_alloyed.name=Meteorite Sword (Alloyed)
item.meteorite_sword_machined.name=Meteorite Sword (Machined)
item.meteorite_sword_treated.name=Meteorite Sword (Treated)
item.meteorite_sword_etched.name=Meteorite Sword (Etched)
item.meteorite_sword.name=Meteorite Sword
item.meteorite_sword.name=Meteorite Sword
item.meteorite_sword_bred.name=Meteorite Sword (Bred)
item.meteorite_sword_irradiated.name=Meteorite Sword (Irradiated)
item.meteorite_sword_fused.name=Meteorite Sword (Fused)
item.meteorite_sword_baleful.name=Meteorite Sword (Baleful)
item.mike_cooling_unit.name=Deuterium Cooling Unit
item.mike_core.name=Uranium Coated Deuterium Tank
item.mike_deut.name=Deuterium Tank
@ -2422,6 +2426,7 @@ tile.mine_fat.name=Fat Mine
tile.mine_he.name=Anti-Tank Mine
tile.mine_shrap.name=Shrapnel Mine
tile.mud_block.name=Poisonous Mud
tile.muffler.name=Muffler
tile.mush.name=Glowing Mushroom
tile.ntm_dirt.name=Dirt
tile.nuke_boy.name=Little Boy

BIN
src/main/java/assets/hbm/textures/armor/ajr_helmet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/main/java/assets/hbm/textures/armor/hev_chest.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/main/java/assets/hbm/textures/armor/hev_helmet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 791 B

After

Width:  |  Height:  |  Size: 792 B

BIN
src/main/java/assets/hbm/textures/items/beta.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 214 B

BIN
src/main/java/assets/hbm/textures/items/canteen_fab.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 208 B

1
src/main/java/com/hbm/crafting/ConsumableRecipes.java
View File

@ -63,6 +63,7 @@ public class ConsumableRecipes {
//Canteens
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_13, 1), new Object[] { "O", "P", 'O', Items.potionitem, 'P', "plateSteel" }));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.canteen_vodka, 1), new Object[] { "O", "P", 'O', Items.potato, 'P', "plateSteel" }));
GameRegistry.addRecipe(new ItemStack(ModItems.canteen_fab, 1), new Object[] { "VMV", "MVM", "VMV", 'V', ModItems.canteen_vodka, 'M', ModItems.powder_magic });
//Soda
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.bottle_empty, 6), new Object[] { " G ", "G G", "GGG", 'G', "paneGlass" }));

13
src/main/java/com/hbm/entity/mob/EntityFBI.java
View File

@ -185,15 +185,10 @@ public class EntityFBI extends EntityMob implements IRangedAttackMob {
public boolean isPotionApplicable(PotionEffect potion)
{
if(Potion.potionTypes[potion.getPotionID()].isBadEffect()) {
if(this.getEquipmentInSlot(4) == null)
this.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask_m65));
return false;
}
return true;
if(this.getEquipmentInSlot(4) == null)
this.setCurrentItemOrArmor(4, new ItemStack(ModItems.gas_mask_m65));
return false;
}
public void onLivingUpdate() {

3
src/main/java/com/hbm/inventory/AssemblerRecipes.java
View File

@ -33,7 +33,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.oredict.OreDictionary;
@Untested
@ -284,7 +283,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModBlocks.machine_crystallizer, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 4), new ComparableStack(ModItems.pipes_steel, 4), new OreDictStack("ingotDesh", 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.blades_advanced_alloy, 2), new OreDictStack("ingotSteel", 16), new OreDictStack("plateTitanium", 16), new ComparableStack(Blocks.glass, 4), new ComparableStack(ModItems.circuit_gold, 1), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_fluidtank, 1), new AStack[] {new OreDictStack("ingotSteel", 2), new OreDictStack("plateSteel", 6), new ComparableStack(ModItems.hull_big_steel, 4), },150);
makeRecipe(new ComparableStack(ModBlocks.machine_drill, 1), new AStack[] {new ComparableStack(ModBlocks.steel_scaffold, 6), new OreDictStack("ingotSteel", 4), new ComparableStack(ModItems.wire_red_copper, 4), new ComparableStack(ModItems.circuit_copper, 1), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.ingot_dura_steel, 2), new ComparableStack(ModItems.bolt_dura_steel, 2), new ComparableStack(ModItems.drill_titanium, 1), },200);
makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 5), new ComparableStack(ModItems.ingot_polymer, 8), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.ingot_dura_steel, 4), new ComparableStack(ModItems.bolt_dura_steel, 6), new ComparableStack(ModBlocks.machine_lithium_battery, 3), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_mining_laser, 1), new AStack[] {new ComparableStack(ModItems.tank_steel, 3), new OreDictStack("ingotSteel", 8), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.crystal_redstone, 3), new ComparableStack(Items.diamond, 5), new ComparableStack(ModItems.ingot_polymer, 4), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.ingot_dura_steel, 4), new ComparableStack(ModItems.bolt_dura_steel, 6), new ComparableStack(ModBlocks.machine_lithium_battery, 1), },400);
makeRecipe(new ComparableStack(ModBlocks.machine_turbofan, 1), new AStack[] {new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.turbine_tungsten, 1), new ComparableStack(ModItems.turbine_titanium, 7), new ComparableStack(ModItems.bolt_compound, 8), new OreDictStack("ingotRedCopperAlloy", 12), new ComparableStack(ModItems.wire_red_copper, 24), },500);
makeRecipe(new ComparableStack(ModBlocks.machine_teleporter, 1), new AStack[] {new OreDictStack("ingotTitanium", 6), new ComparableStack(ModItems.plate_advanced_alloy, 12), new ComparableStack(ModItems.plate_combine_steel, 4), new ComparableStack(ModItems.telepad, 1), new ComparableStack(ModItems.entanglement_kit, 1), new ComparableStack(ModBlocks.machine_battery, 2), new ComparableStack(ModItems.coil_magnetized_tungsten, 4), },300);
makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_transmutator, 1), new AStack[] {new ComparableStack(ModItems.ingot_magnetized_tungsten, 1), new OreDictStack("ingotTitanium", 24), new ComparableStack(ModItems.plate_advanced_alloy, 18), new OreDictStack("plateSteel", 12), new ComparableStack(ModItems.plate_desh, 6), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModBlocks.machine_battery, 5), new ComparableStack(ModItems.circuit_gold, 5), },500);

2
src/main/java/com/hbm/inventory/BreederRecipes.java
View File

@ -75,6 +75,8 @@ public class BreederRecipes {
recipes.put(new ComparableStack(ModBlocks.sellafield_2), new BreederRecipe(new ItemStack(ModBlocks.sellafield_3), 3));
recipes.put(new ComparableStack(ModBlocks.sellafield_3), new BreederRecipe(new ItemStack(ModBlocks.sellafield_4), 4));
recipes.put(new ComparableStack(ModBlocks.sellafield_4), new BreederRecipe(new ItemStack(ModBlocks.sellafield_core), 4));
recipes.put(new ComparableStack(ModItems.meteorite_sword_etched), new BreederRecipe(new ItemStack(ModItems.meteorite_sword_bred), 4));
}
public static void registerFuels() {

22
src/main/java/com/hbm/items/ModItems.java
View File

@ -1430,6 +1430,7 @@ public class ModItems {
public static Item canteen_13;
public static Item canteen_vodka;
public static Item canteen_fab;
public static Item defuser;
@ -1578,6 +1579,7 @@ public class ModItems {
public static Item gas_mask_m65;
public static Item oxy_mask;
public static Item hat;
public static Item beta;
public static Item t45_helmet;
public static Item t45_plate;
@ -1705,6 +1707,10 @@ public class ModItems {
public static Item meteorite_sword_machined;
public static Item meteorite_sword_treated;
public static Item meteorite_sword_etched;
public static Item meteorite_sword_bred;
public static Item meteorite_sword_irradiated;
public static Item meteorite_sword_fused;
public static Item meteorite_sword_baleful;
public static Item matchstick;
public static Item balefire_and_steel;
@ -3354,8 +3360,9 @@ public class ModItems {
twinkie = new ItemLemon(3, 5, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie");
static_sandwich = new ItemLemon(6, 5, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich");
pudding = new ItemLemon(6, 15, false).setUnlocalizedName("pudding").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pudding");
canteen_13 = new ItemCanteen(1 * 60 * 20).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13");
canteen_vodka = new ItemCanteen(3 * 60 * 20).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka");
canteen_13 = new ItemCanteen(1 * 60).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13");
canteen_vodka = new ItemCanteen(3 * 60).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka");
canteen_fab = new ItemCanteen(2 * 60).setUnlocalizedName("canteen_fab").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_fab");
pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake");
nugget = new ItemLemon(200, 200, false).setUnlocalizedName("nugget").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nugget");
@ -3654,6 +3661,7 @@ public class ModItems {
gas_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask");
gas_mask_m65 = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("gas_mask_m65").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_m65");
hat = new ArmorHat(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("nossy_hat").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hat");
beta = new ItemDrop().setUnlocalizedName("beta").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":beta");
//oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask");
schrabidium_helmet = new ArmorFSB(MainRegistry.aMatSchrab, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F)
@ -4007,6 +4015,10 @@ public class ModItems {
meteorite_sword_machined = new ItemSwordMeteorite(65F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_machined").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_treated = new ItemSwordMeteorite(80F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_treated").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_etched = new ItemSwordMeteorite(100F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_etched").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_bred = new ItemSwordMeteorite(125F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_bred").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_irradiated = new ItemSwordMeteorite(175F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_irradiated").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_fused = new ItemSwordMeteorite(250F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_fused").setTextureName(RefStrings.MODID + ":meteorite_sword");
meteorite_sword_baleful = new ItemSwordMeteorite(500F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword");
mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy");
@ -5808,6 +5820,10 @@ public class ModItems {
GameRegistry.registerItem(meteorite_sword_machined, meteorite_sword_machined.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_treated, meteorite_sword_treated.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_etched, meteorite_sword_etched.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_bred, meteorite_sword_bred.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_irradiated, meteorite_sword_irradiated.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_fused, meteorite_sword_fused.getUnlocalizedName());
GameRegistry.registerItem(meteorite_sword_baleful, meteorite_sword_baleful.getUnlocalizedName());
//Multitool
GameRegistry.registerItem(multitool_hit, multitool_hit.getUnlocalizedName());
@ -5870,6 +5886,7 @@ public class ModItems {
GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName());
GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName());
GameRegistry.registerItem(canteen_vodka, canteen_vodka.getUnlocalizedName());
GameRegistry.registerItem(canteen_fab, canteen_fab.getUnlocalizedName());
//Energy Drinks
GameRegistry.registerItem(can_empty, can_empty.getUnlocalizedName());
@ -6001,6 +6018,7 @@ public class ModItems {
GameRegistry.registerItem(gas_mask_m65, gas_mask_m65.getUnlocalizedName());
//GameRegistry.registerItem(oxy_mask, oxy_mask.getUnlocalizedName());
GameRegistry.registerItem(hat, hat.getUnlocalizedName());
GameRegistry.registerItem(beta, beta.getUnlocalizedName());
GameRegistry.registerItem(steel_helmet, steel_helmet.getUnlocalizedName());
GameRegistry.registerItem(steel_plate, steel_plate.getUnlocalizedName());

7
src/main/java/com/hbm/items/armor/ArmorFSB.java
View File

@ -8,8 +8,6 @@ import java.util.Map.Entry;
import org.lwjgl.opengl.GL11;
import com.hbm.interfaces.Untested;
import com.hbm.items.ModItems;
import com.hbm.saveddata.RadiationSavedData;
import com.hbm.util.I18nUtil;
@ -313,7 +311,7 @@ public class ArmorFSB extends ItemArmor {
ArmorFSB chestplate = (ArmorFSB)plate.getItem();
if(chestplate.damageThreshold >= event.ammount) {
if(chestplate.damageThreshold >= event.ammount && !event.source.isUnblockable()) {
event.setCanceled(true);
}
@ -343,7 +341,8 @@ public class ArmorFSB extends ItemArmor {
if(event.ammount < 100) {
event.ammount -= chestplate.damageThreshold;
if(!event.source.isUnblockable())
event.ammount -= chestplate.damageThreshold;
if(chestplate.damageMod != -1) {
event.ammount *= chestplate.damageMod;

14
src/main/java/com/hbm/items/food/ItemCanteen.java
View File

@ -26,7 +26,7 @@ public class ItemCanteen extends Item {
@Override
public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) {
if (stack.getItemDamage() > 0)
if(stack.getItemDamage() > 0 && entity.ticksExisted % 20 == 0)
stack.setItemDamage(stack.getItemDamage() - 1);
}
@ -41,6 +41,13 @@ public class ItemCanteen extends Item {
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0));
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 2));
}
if (this == ModItems.canteen_fab) {
player.heal(10F);
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 15 * 20, 0));
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 60 * 20, 2));
player.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 2));
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1));
}
return stack;
}
@ -91,6 +98,11 @@ public class ItemCanteen extends Item {
else
list.add("Smells like disinfectant, tastes like disinfectant.");
}
if(this == ModItems.canteen_fab)
{
list.add("Cooldown: 2 minutes");
list.add("Engages the fab drive");
}
}
}

4
src/main/java/com/hbm/items/special/ItemCustomLore.java
View File

@ -413,7 +413,9 @@ public class ItemCustomLore extends Item {
this == ModItems.cell_sas3 || this == ModItems.powder_schrabidium ||
this == ModItems.wire_schrabidium || this == ModItems.circuit_schrabidium ||
this == ModItems.gun_revolver_schrabidium_ammo || this == ModItems.ingot_saturnite ||
this == ModItems.plate_saturnite)
this == ModItems.plate_saturnite || this == ModItems.ingot_schrabidate ||
this == ModItems.powder_schrabidate || this == ModItems.ingot_schraranium ||
this == ModItems.crystal_schraranium)
{
return EnumRarity.rare;
}

5
src/main/java/com/hbm/items/special/ItemDrop.java
View File

@ -34,6 +34,11 @@ public class ItemDrop extends Item {
public boolean onEntityItemUpdate(EntityItem entityItem) {
if (entityItem != null) {
if(this == ModItems.beta) {
entityItem.setDead();
return true;
}
ItemStack stack = entityItem.getEntityItem();
if (stack.getItem() != null && stack.getItem() == ModItems.detonator_deadman) {

53
src/main/java/com/hbm/items/tool/ItemSwordMeteorite.java
View File

@ -60,6 +60,59 @@ public class ItemSwordMeteorite extends ItemSwordAbility {
list.add(EnumChatFormatting.ITALIC + "Acids clean the material");
list.add(EnumChatFormatting.ITALIC + "To make this the perfect sword");
}
if(this == ModItems.meteorite_sword_bred) {
list.add(EnumChatFormatting.ITALIC + "Immense heat and radiation");
list.add(EnumChatFormatting.ITALIC + "Compress the material");
}
if(this == ModItems.meteorite_sword_irradiated) {
list.add(EnumChatFormatting.ITALIC + "The power of the Atom");
list.add(EnumChatFormatting.ITALIC + "Gives the sword might");
}
if(this == ModItems.meteorite_sword_fused) {
list.add(EnumChatFormatting.ITALIC + "This blade has met");
list.add(EnumChatFormatting.ITALIC + "With the forces of the stars");
}
if(this == ModItems.meteorite_sword_baleful) {
list.add(EnumChatFormatting.ITALIC + "This sword has met temperatures");
list.add(EnumChatFormatting.ITALIC + "Far beyond what normal material can endure");
}
/*if(this == ModItems.meteorite_sword_subatomic) {
}*/
/*if(this == ModItems.meteorite_sword_void) {
}*/
/*if(this == ModItems.meteorite_sword_clouded) {
list.add(EnumChatFormatting.ITALIC + "The sword to fell");
list.add(EnumChatFormatting.ITALIC + "The capital");
}*/
/*if(this == ModItems.meteorite_sword_enchanted) {
list.add(EnumChatFormatting.ITALIC + "The sword to defeat");
list.add(EnumChatFormatting.ITALIC + "The country");
}*/
/*if(this == ModItems.meteorite_sword_fstbmb) {
list.add(EnumChatFormatting.ITALIC + "The sword to end");
list.add(EnumChatFormatting.ITALIC + "The world");
}*/
/*if(this == ModItems.meteorite_sword_digama) {
list.add(EnumChatFormatting.ITALIC + "The sword to extinguish");
list.add(EnumChatFormatting.ITALIC + "The universe");
}*/
//meteorite_sword_duchess
//meteorite_sword_queen
//meteorite_sword_storm
//§k
}
}

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

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

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

@ -217,6 +217,10 @@ public class ClientProxy extends ServerProxy {
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_machined, new ItemRendererMeteorSword(1.0F, 1.0F, 0.0F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_treated, new ItemRendererMeteorSword(0.5F, 1.0F, 0.5F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_etched, new ItemRendererMeteorSword(1.0F, 1.0F, 0.5F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_bred, new ItemRendererMeteorSword(0.5F, 0.5F, 0.0F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_irradiated, new ItemRendererMeteorSword(0.75F, 1.0F, 0.0F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_fused, new ItemRendererMeteorSword(1.0F, 0.0F, 0.5F));
MinecraftForgeClient.registerItemRenderer(ModItems.meteorite_sword_baleful, new ItemRendererMeteorSword(0.0F, 1.0F, 0.0F));
//swords and hammers
MinecraftForgeClient.registerItemRenderer(ModItems.redstone_sword, new ItemRenderRedstoneSword());
MinecraftForgeClient.registerItemRenderer(ModItems.big_sword, new ItemRenderBigSword());

3
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -944,6 +944,7 @@ public class MainRegistry {
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), FluidType.SCHRABIDIC, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_water), new ItemStack(ModItems.rod_empty), FluidType.WATER, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.rod_dual_water), new ItemStack(ModItems.rod_dual_empty), FluidType.WATER, 2000));
@ -973,6 +974,8 @@ public class MainRegistry {
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), FluidType.OXYGEN, 10000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), new ItemStack(ModBlocks.stone_gneiss), FluidType.PETROLEUM, 250));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000));
FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000));

5
src/main/java/com/hbm/main/ModEventHandler.java
View File

@ -122,6 +122,9 @@ public class ModEventHandler
if(!player.inventory.hasItem(ModItems.hat))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.hat));
if(!player.inventory.hasItem(ModItems.beta))
player.inventory.addItemStackToInventory(new ItemStack(ModItems.beta));
}
}
@ -493,7 +496,7 @@ public class ModEventHandler
/// GHOST FIX END ///
/// BETA HEALTH START ///
if(player.getDisplayName().equals("Dr_Nostalgia")) {
if(player.inventory.hasItem(ModItems.beta)) {
if(player.getFoodStats().getFoodLevel() > 10) {
player.heal(player.getFoodStats().getFoodLevel() - 10);

2
src/main/java/com/hbm/render/item/weapon/ItemRenderWeaponQuadro.java
View File

@ -110,7 +110,7 @@ public class ItemRenderWeaponQuadro implements IItemRenderer {
Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.quadro_tex);
ResourceManager.quadro.renderPart("Launcher");
if(ItemGunBase.getMag(item) > 0 || ItemGunBase.getIsReloading(item)) {
if(ItemGunBase.getMag(item) > 0 || ItemGunBase.getIsReloading(item) && type != ItemRenderType.INVENTORY) {
GL11.glPushMatrix();
GL11.glTranslated(0, -1, 0);

6
src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
View File

@ -182,6 +182,12 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer,
BreederRecipe out = BreederRecipes.getOutput(slots[1]);
if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_irradiated)
out = new BreederRecipe(ModItems.meteorite_sword_fused, 1);
if(slots[1] != null && slots[1].getItem() == ModItems.meteorite_sword_fused)
out = new BreederRecipe(ModItems.meteorite_sword_baleful, 4);
if(out == null) {
this.progress = 0;
return;

14
src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java
View File

@ -3,6 +3,7 @@ package com.hbm.tileentity.machine;
import java.util.ArrayList;
import java.util.List;
import com.hbm.blocks.ModBlocks;
import com.hbm.config.WeaponConfig;
import com.hbm.interfaces.IConsumer;
import com.hbm.interfaces.Untested;
@ -74,11 +75,14 @@ public class TileEntityMachineRadar extends TileEntityTickingBase implements ICo
sendMissileData();
pingTimer++;
if(power > 0 && pingTimer >= maxTimer) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.sonarPing", 5.0F, 1.0F);
pingTimer = 0;
if(worldObj.getBlock(xCoord, yCoord - 1, zCoord) != ModBlocks.muffler) {
pingTimer++;
if(power > 0 && pingTimer >= maxTimer) {
this.worldObj.playSoundEffect(this.xCoord, this.yCoord, this.zCoord, "hbm:block.sonarPing", 5.0F, 1.0F);
pingTimer = 0;
}
}
}
}

4
src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java
View File

@ -435,6 +435,10 @@ public class TileEntityMachineReactorLarge extends TileEntity
}
}
//Meteorite sword
if(slots[4] != null && coreHeat > 0 && slots[4].getItem() == ModItems.meteorite_sword_bred)
slots[4] = new ItemStack(ModItems.meteorite_sword_irradiated);
//Load fuel
if(slots[4] != null && getFuelContent(slots[4], type) > 0) {

10
src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
View File

@ -344,9 +344,15 @@ public class TileEntityMachineReactorSmall extends TileEntity implements ISidedI
}
if(rods >= rodsMax)
for(int i = 0; i < 12; i++) {
if(slots[i] != null && slots[i].getItem() instanceof ItemFuelRod)
decay(i);
if(slots[i] != null) {
if(slots[i].getItem() instanceof ItemFuelRod)
decay(i);
else if(slots[i].getItem() == ModItems.meteorite_sword_bred)
slots[i] = new ItemStack(ModItems.meteorite_sword_irradiated);
}
}
coreHeatMod = 1.0;

6
src/main/java/com/hbm/tileentity/machine/TileEntityMachineShredder.java
View File

@ -277,9 +277,9 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven
for (int outSlot = 9; outSlot < 27; outSlot++)
{
if (slots[outSlot] != null && slots[outSlot].getItem() == outp.getItem() && slots[outSlot].stackSize + outp.stackSize <= outp.getMaxStackSize()) {
System.out.println(outp.getUnlocalizedName() + " is equal to " + slots[outSlot].getUnlocalizedName());
if (slots[outSlot] != null && slots[outSlot].getItem() == outp.getItem() &&
slots[outSlot].getItemDamage() == outp.getItemDamage() &&
slots[outSlot].stackSize + outp.stackSize <= outp.getMaxStackSize()) {
slots[outSlot].stackSize += outp.stackSize;
slots[inpSlot].stackSize -= 1;

16
src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java
View File

@ -9,6 +9,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
@ -183,5 +184,20 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IConsu
public long getMaxPower() {
return maxPower;
}
@Override
public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt);
power = nbt.getLong("power");
speed = nbt.getInteger("speed");
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
nbt.setLong("power", power);
nbt.setInteger("speed", speed);
}
}

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

@ -3,7 +3,7 @@
"modid": "hbm",
"name": "Hbm's Nuclear Tech",
"description": "A mod that adds weapons, nuclear themed stuff and machines",
"version":"1.0.27-3726",
"version":"1.0.27-3731",
"mcversion": "1.7.10",
"url": "",
"updateUrl": "",