Changed Difurnace textures, added chainsaw and glowing mushroom stew, enabled config file

This commit is contained in:
HbmMods 2016-01-25 19:26:54 +01:00
parent 3b98716d69
commit 6a69c66a97
24 changed files with 102 additions and 90 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 394 B

After

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 B

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

After

Width:  |  Height:  |  Size: 430 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 270 B

View File

@ -2,6 +2,7 @@ package com.hbm.blocks;
import java.util.Random;
import com.hbm.main.MainRegistry;
import com.hbm.world.HugeMush;
import net.minecraft.block.Block;
@ -123,7 +124,7 @@ public class BlockMush extends Block implements IGrowable {
public void updateTick(World world, int x, int y, int z, Random rand)
{
this.checkAndDropBlock(world, x, y, z);
if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0)
if(world.getBlock(x, y - 1, z) == ModBlocks.waste_earth && rand.nextInt(5) == 0 && MainRegistry.enableMycelium)
{
world.setBlock(x, y - 1, z, ModBlocks.waste_mycelium);
}

View File

@ -156,7 +156,7 @@ public class NukeBoy extends BlockContainer {
entity.posX = x;
entity.posY = y;
entity.posZ = z;
entity.destructionRange = 120;
entity.destructionRange = MainRegistry.boyRadius;
entity.speed = 25;
entity.coefficient = 10.0F;
world.spawnEntityInWorld(entity);

View File

@ -125,7 +125,7 @@ public class NukeFleija extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 50);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.fleijaRadius);
}
}
}

View File

@ -173,7 +173,7 @@ public class NukeGadget extends BlockContainer {
entity.posX = x;
entity.posY = y;
entity.posZ = z;
entity.destructionRange = 150;
entity.destructionRange = MainRegistry.gadgetRadius;
entity.speed = 25;
entity.coefficient = 10.0F;

View File

@ -172,7 +172,7 @@ public class NukeMan extends BlockContainer {
entity.posX = x;
entity.posY = y;
entity.posZ = z;
entity.destructionRange = 175;
entity.destructionRange = MainRegistry.manRadius;
entity.speed = 25;
entity.coefficient = 10.0F;

View File

@ -125,7 +125,7 @@ public class NukeMike extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 175);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.manRadius);
}
if(entity.isFilled())
@ -133,7 +133,7 @@ public class NukeMike extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 250);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.mikeRadius);
}
}
}

View File

@ -109,7 +109,7 @@ public class NukePrototype extends BlockContainer {
this.onBlockDestroyedByPlayer(world, x, y, z, 1);
entity.clearSlots();
world.setBlockToAir(x, y, z);
igniteTestBomb(world, x, y, z, 150);
igniteTestBomb(world, x, y, z, MainRegistry.prototypeRadius);
}
return true;
} else if(!player.isSneaking())
@ -136,7 +136,7 @@ public class NukePrototype extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 150);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.prototypeRadius);
}
}
}

View File

@ -125,7 +125,7 @@ public class NukeTsar extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 175);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.manRadius);
}
if(entity.isFilled())
@ -133,7 +133,7 @@ public class NukeTsar extends BlockContainer {
this.onBlockDestroyedByPlayer(p_149695_1_, x, y, z, 1);
entity.clearSlots();
p_149695_1_.setBlockToAir(x, y, z);
igniteTestBomb(p_149695_1_, x, y, z, 500);
igniteTestBomb(p_149695_1_, x, y, z, MainRegistry.tsarRadius);
}
}
}

View File

@ -5,6 +5,7 @@ import java.util.Random;
import com.hbm.entity.EntityNuclearCreeper;
import com.hbm.lib.Library;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -155,7 +156,7 @@ public class WasteEarth extends Block {
@Override
public void updateTick(World world, int x, int y, int z, Random rand)
{
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0)
if((this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium) && world.getBlock(x, y + 1, z) == Blocks.air && rand.nextInt(10) == 0 && MainRegistry.enableMycelium)
{
Block b0;
int count = 0;
@ -172,16 +173,9 @@ public class WasteEarth extends Block {
}
if(count > 0 && count < 5)
world.setBlock(x, y + 1, z, ModBlocks.mush);
if (!world.isRemote)
{
if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2)
{
world.setBlock(x, y, z, Blocks.dirt);
}
}
}
if(this == ModBlocks.waste_mycelium)
if(this == ModBlocks.waste_mycelium && MainRegistry.enableMycelium)
{
for(int i = -1; i < 2; i++) {
for(int j = -1; j < 2; j++) {
@ -196,6 +190,17 @@ public class WasteEarth extends Block {
}
}
}
if(this == ModBlocks.waste_earth || this == ModBlocks.waste_mycelium)
{
if (!world.isRemote)
{
if (world.getBlockLightValue(x, y + 1, z) < 4 && world.getBlockLightOpacity(x, y + 1, z) > 2)
{
world.setBlock(x, y, z, Blocks.dirt);
}
}
}
}
}

View File

@ -72,7 +72,7 @@ public class EntityNuclearCreeper extends EntityMob {
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(50.0D);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.15D);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.3D);
}
/**
@ -258,6 +258,11 @@ public class EntityNuclearCreeper extends EntityMob {
strength = (int)f;
super.onUpdate();
if(this.getHealth() < this.getMaxHealth() && this.ticksExisted % 10 == 0)
{
this.heal(1.0F);
}
}
/**

View File

@ -259,6 +259,14 @@ public class EntityRocket extends Entity implements IProjectile
if (!this.worldObj.isRemote)
{
this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.5F, true);
/*EntityNukeExplosionAdvanced explosion = new EntityNukeExplosionAdvanced(this.worldObj);
explosion.speed = 25;
explosion.coefficient = 5.0F;
explosion.destructionRange = 20;
explosion.posX = this.posX;
explosion.posY = this.posY;
explosion.posZ = this.posZ;
this.worldObj.spawnEntityInWorld(explosion);*/
}
this.setDead();
}

View File

@ -421,7 +421,7 @@ public class ExplosionChaos {
{
if(entity instanceof EntityPlayer && Library.checkForGasMask((EntityPlayer)entity))
{
Library.damageSuit(((EntityPlayer)entity), 3);
//Library.damageSuit(((EntityPlayer)entity), 3);
} else if(entity instanceof EntityLivingBase)
{

View File

@ -89,11 +89,11 @@ public class ExplosionNukeGeneric {
double d5;
double d6;
double d7;
double wat = bombStartStrength*2;
double wat = bombStartStrength/**2*/;
boolean isOccupied = false;
bombStartStrength *= 2.0F;
//bombStartStrength *= 2.0F;
i = MathHelper.floor_double(x - wat - 1.0D);
j = MathHelper.floor_double(x + wat + 1.0D);
k = MathHelper.floor_double(y - wat - 1.0D);

View File

@ -8,6 +8,7 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.item.ItemSoup;
public class ModItems {
@ -307,6 +308,7 @@ public class ModItems {
public static Item cotton_candy;
public static Item apple_schrabidium;
public static Item tem_flakes;
public static Item glowing_stew;
public static Item flame_pony;
public static Item flame_conspiracy;
@ -363,6 +365,8 @@ public class ModItems {
public static Item t45_plate;
public static Item t45_legs;
public static Item t45_boots;
public static Item chainsaw;
public static Item schrabidium_helmet;
public static Item schrabidium_plate;
@ -691,6 +695,7 @@ public class ModItems {
cotton_candy = new ItemCottonCandy(5, false).setUnlocalizedName("cotton_candy").setCreativeTab(MainRegistry.tabNuke).setFull3D().setTextureName(RefStrings.MODID + ":cotton_candy");
apple_schrabidium = new ItemAppleSchrabidium(20, 100, false).setUnlocalizedName("apple_schrabidium").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":apple_schrabidium");
tem_flakes = new ItemTemFlakes(0, 0, false).setUnlocalizedName("tem_flakes").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":tem_flakes");
glowing_stew = new ItemSoup(6).setUnlocalizedName("glowing_stew").setCreativeTab(MainRegistry.tabNuke).setTextureName(RefStrings.MODID + ":glowing_stew");
flame_pony = new ItemCustomLore().setUnlocalizedName("flame_pony").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_pony");
flame_conspiracy = new ItemCustomLore().setUnlocalizedName("flame_conspiracy").setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":flame_conspiracy");
@ -766,6 +771,8 @@ public class ModItems {
t45_legs = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 2).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs");
t45_boots = new ArmorT45(MainRegistry.enumArmorMaterialT45, 2, 3).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots");
chainsaw = new ItemModAxe(MainRegistry.enumToolMaterialChainsaw).setUnlocalizedName("chainsaw").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":chainsaw");
schrabidium_helmet = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 0).setUnlocalizedName("schrabidium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_helmet");
schrabidium_plate = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 1).setUnlocalizedName("schrabidium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_plate");
schrabidium_legs = new ArmorSchrabidium(MainRegistry.enumArmorMaterialSchrabidium, 7, 2).setUnlocalizedName("schrabidium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_legs");
@ -1130,6 +1137,7 @@ public class ModItems {
GameRegistry.registerItem(cotton_candy, cotton_candy.getUnlocalizedName());
GameRegistry.registerItem(apple_schrabidium, apple_schrabidium.getUnlocalizedName());
GameRegistry.registerItem(tem_flakes, tem_flakes.getUnlocalizedName());
GameRegistry.registerItem(glowing_stew, glowing_stew.getUnlocalizedName());
//The Gadget
GameRegistry.registerItem(gadget_explosive, gadget_explosive.getUnlocalizedName());
@ -1174,6 +1182,7 @@ public class ModItems {
GameRegistry.registerItem(t45_boots, t45_boots.getUnlocalizedName());
//Nobody will ever read this anyway, so it shouldn't matter.
GameRegistry.registerItem(chainsaw, chainsaw.getUnlocalizedName());
GameRegistry.registerItem(igniter, igniter.getUnlocalizedName());
GameRegistry.registerItem(hazmat_helmet, hazmat_helmet.getUnlocalizedName());
GameRegistry.registerItem(hazmat_plate, hazmat_plate.getUnlocalizedName());

View File

@ -399,7 +399,7 @@ public class CraftingManager {
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SPS", "NCN", "SPS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_awesome, 1), new Object[] { "SNS", "PCP", "SNS", 'C', ModItems.syringe_empty, 'S', ModItems.sulfur, 'P', ModItems.nugget_pu239, 'N', ModItems.nugget_pu238 });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_empty, 6), new Object[] { "P", "C", "B", 'B', Item.getItemFromBlock(Blocks.iron_bars), 'C', ModItems.rod_empty, 'P', ModItems.plate_iron });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_empty });
GameRegistry.addRecipe(new ItemStack(ModItems.syringe_metal_stimpak, 1), new Object[] { " N ", "NSN", " N ", 'N', Items.nether_wart, 'S', ModItems.syringe_metal_empty });
GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_gadget), 1), new Object[] { "DGD", "FCF", "DPD", 'G', ModItems.wire_gold, 'F', ModItems.fins_flat, 'C', ModItems.sphere_steel, 'P', ModItems.pedestal_steel, 'D', new ItemStack(Items.dye, 1, 8) });

View File

@ -4,6 +4,8 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.FMLCommonHandler;
@ -104,69 +106,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class MainRegistry
{
@Instance(RefStrings.MODID)
public static MainRegistry instance;
/*public static Achievement achievementGetTitanium;
public static Achievement achievementCraftDiFurnace;
public static Achievement achievementGetSteel;
public static Achievement achievementCraftCentrifuge;
public static Achievement achievementGetUranium;
public static Achievement achievementCraftReactor;
public static Achievement achievementGetPlutonium;
public static Achievement achievementGetSchrabidium;
public static Achievement achievementGetEuphemium;
public static Achievement achievementGetRedCopper;
public static Achievement achievementCraftWireCoated;
public static Achievement achievementCraftCoal;
public static Achievement achievementCraftGenerator;
public static Achievement achievementCraftElectricFurnace;
public static Achievement achievementCraftDeuterium;
public static Achievement achievementCraftCircuit;
public static Achievement achievementCraftBattery;
public static Achievement achievementCraftEnergyStorage;
public static Achievement achievementCraftNukeFurnace;
public static Achievement achievementCraftUraniumRod;
public static Achievement achievementCraftUraniumDualRod;
public static Achievement achievementCraftUraniumQuadRod;
public static Achievement achievementCraftUraniumFuel;
public static Achievement achievementCraftPlutoniumRod;
public static Achievement achievementCraftRtg;
public static Achievement achievementCraftRtgFurnace;
public static Achievement achievementCraftPlutoniumFuel;
public static Achievement achievementCraftMoxFuel;
public static Achievement achievementCraftSchrabidiumRod;
public static Achievement achievementCraftSchrabidiumFuel;
public static Achievement achievementCraftSchrabidiumApple;
public static Achievement achievementCraftSchrabidiumCircuit;
public static Achievement achievementCraftWatch;
public static Achievement achievementGetNeutronReflector;
public static Achievement achievementCraftRevolver;
public static Achievement achievementCraftGrenade;
public static Achievement achievementCraftGrenadeStrong;
public static Achievement achievementCraftGrenadeCluster;
public static Achievement achievementCraftGrenadeFlare;
public static Achievement achievementCraftGrenadeSchrbidium;
public static Achievement achievementCraftLittleBoy;
public static Achievement achievementCraftTheGadget;
public static Achievement achievementCraftFatMan;
public static Achievement achievementCraftIvyMike;
public static Achievement achievementCraftTsarBomba;
public static Achievement achievementCraftFleija;
public static Achievement achievementCraftIgniter;
public static Achievement achievementCraftSas3;
public static Achievement achievementCraftPrototype;*/
public static MainRegistry instance;
@SidedProxy(clientSide = RefStrings.CLIENTSIDE, serverSide = RefStrings.SERVERSIDE)
public static ServerProxy proxy;
@ -175,7 +115,8 @@ public class MainRegistry
public static ModMetadata meta;
//Tool Materials
public static ToolMaterial enumToolMaterialSchrabidium = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 20.0F, 200);
public static ToolMaterial enumToolMaterialSchrabidium = EnumHelper.addToolMaterial("SCHRABIDIUM", 3, 10000, 50.0F, 100.0F, 200);
public static ToolMaterial enumToolMaterialChainsaw = EnumHelper.addToolMaterial("CHAINSAW", 3, 5000, 50.0F, 47.0F, 0);
//Armor Materials
public static ArmorMaterial enumArmorMaterialEmerald = EnumHelper.addArmorMaterial("TEST", 2500, new int[] {3, 8, 6, 3}, 30);
@ -191,6 +132,14 @@ public class MainRegistry
public static CreativeTabs tabNuke = new NukeTab(CreativeTabs.getNextID(), "tabNuke");
public static boolean enableDebugMode = true;
public static boolean enableMycelium = true;
public static int gadgetRadius = 150;
public static int boyRadius = 120;
public static int manRadius = 175;
public static int mikeRadius = 250;
public static int tsarRadius = 500;
public static int prototypeRadius = 50;
public static int fleijaRadius = 150;
@EventHandler
public void PreLoad(FMLPreInitializationEvent PreEvent)
@ -337,11 +286,46 @@ public class MainRegistry
}
@EventHandler
public void preinit(FMLPreInitializationEvent event)
public void preInit(FMLPreInitializationEvent event)
{
FMLCommonHandler.instance().bus().register(new ModEventHandler());
MinecraftForge.EVENT_BUS.register(new ModEventHandler());
MinecraftForge.TERRAIN_GEN_BUS.register(new ModEventHandler());
MinecraftForge.ORE_GEN_BUS.register(new ModEventHandler());
Configuration config = new Configuration(event.getSuggestedConfigurationFile());
config.load();
enableDebugMode = config.get(Configuration.CATEGORY_GENERAL, "_enableDebugMode", true).getBoolean(true);
enableMycelium = config.get(Configuration.CATEGORY_GENERAL, "_enableMyceliumSpread", true).getBoolean(true);
Property propGadget = config.get(Configuration.CATEGORY_GENERAL, "gadgetRadius", 150);
propGadget.comment = "Radius of the Gadget";
gadgetRadius = propGadget.getInt();
Property propBoy = config.get(Configuration.CATEGORY_GENERAL, "boyRadius", 120);
propBoy.comment = "Radius of Little Boy";
boyRadius = propBoy.getInt();
Property propMan = config.get(Configuration.CATEGORY_GENERAL, "manRadius", 175);
propMan.comment = "Radius of Fat Man";
manRadius = propMan.getInt();
Property propMike = config.get(Configuration.CATEGORY_GENERAL, "mikeRadius", 250);
propMike.comment = "Radius of Ivy Mike";
mikeRadius = propMike.getInt();
Property propTsar = config.get(Configuration.CATEGORY_GENERAL, "tsarRadius", 500);
propTsar.comment = "Radius of the Tsar Bomba";
tsarRadius = propTsar.getInt();
Property propPrototype = config.get(Configuration.CATEGORY_GENERAL, "prototypeRadius", 150);
propPrototype.comment = "Radius of the Prototype";
prototypeRadius = propPrototype.getInt();
Property propFleija = config.get(Configuration.CATEGORY_GENERAL, "fleijaRadius", 50);
propFleija.comment = "Radius of F.L.E.I.J.A.";
fleijaRadius = propFleija.getInt();
config.save();
}
}