BrassGoggledCoders
/
SteamCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet more generalisation/cleanup/code improvements

dev
Arona Jones 2016-02-10 22:45:10 +00:00
parent 87b215c8b8
commit c0b146206d
37 changed files with 130 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/main/java/steamcraft/common/Steamcraft.java
View File

@ -4,7 +4,6 @@ package steamcraft.common;
import java.io.File;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.world.gen.structure.MapGenStructureIO;
import cpw.mods.fml.common.FMLCommonHandler;
@ -14,14 +13,11 @@ import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.Type;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.MinecraftForge;
@ -72,7 +68,7 @@ public class Steamcraft implements IBoilerplateMod
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
LoggerSteamcraft.info("Starting Preinit");
LoggerSteamcraft.getLogger().info("Starting Preinit");
configFolder = new File(event.getModConfigurationDirectory(), "sc2");
Config.initialise(configFolder);
@ -85,13 +81,13 @@ public class Steamcraft implements IBoilerplateMod
CompatabilityLayer.initCompatItems();
CompatibilityHandler.preInit(event);
LoggerSteamcraft.info("Finished Preinit");
LoggerSteamcraft.getLogger().info("Finished Preinit");
}
@EventHandler
public void init(FMLInitializationEvent event)
{
LoggerSteamcraft.info("Starting Init");
LoggerSteamcraft.getLogger().info("Starting Init");
CompatabilityLayer.init();
NetworkRegistry.INSTANCE.registerGuiHandler(instance, new GuiHandler(instance));
@ -124,14 +120,14 @@ public class Steamcraft implements IBoilerplateMod
FMPCompatHandler.doRegister();
CompatibilityHandler.init(event);
LoggerSteamcraft.info("Finished Init");
LoggerSteamcraft.getLogger().info("Finished Init");
}
@SuppressWarnings("rawtypes")
@EventHandler
public void postInit(FMLPostInitializationEvent event)
{
LoggerSteamcraft.info("Starting Postinit");
LoggerSteamcraft.getLogger().info("Starting Postinit");
CompatabilityLayer.postInit();
@ -139,13 +135,13 @@ public class Steamcraft implements IBoilerplateMod
InitAchievements.init();
InitMisc.initDungeonLoot();
LoggerSteamcraft.info("Finished Postinit");
LoggerSteamcraft.info(
LoggerSteamcraft.getLogger().info("Finished Postinit");
LoggerSteamcraft.getLogger().info(
"Please note: Steamcraft2 is now the officially unofficial mod of the Steampunk Forum at BrassGoggles, otherwise known as BG, which is only unofficial because making it official would cause a legal headache but is pretty much official, I'm just not allowed to call it that, so its not official, but it kinda is, ok? Got that? Signed, Major Vincent Smith (Otherwise known as warlordjones) - BrassGoggles moderation team member");
if (Loader.isModLoaded("steamnsteel"))
LoggerSteamcraft.info("Evening to the distingushed ladies and gentlemen of the SteamNSteel club!");
LoggerSteamcraft.getLogger().info("Evening to the distingushed ladies and gentlemen of the SteamNSteel club!");
if (Loader.isModLoaded("ImmersiveEngineering"))
LoggerSteamcraft.info("Evening to the distingushed ladies and gentlemen of the ImmersiveEngineering club!");
LoggerSteamcraft.getLogger().info("Evening to the distingushed ladies and gentlemen of the ImmersiveEngineering club!");
CompatibilityHandler.postInit(event);
/*
@ -169,38 +165,6 @@ public class Steamcraft implements IBoilerplateMod
event.registerServerCommand(new CommandSteamcraft());
}
// Remap old items from merged in mods
@EventHandler
public void missingMapping(FMLMissingMappingsEvent event)
{
for (MissingMapping m : event.get())
{
if (m.type == Type.BLOCK)
{
if (m.name.contains("water"))
{
m.remap(GameRegistry.findBlock(ModInfo.ID, "BlockBoilingwater"));
}
else if (m.name.contains("mud"))
{
m.remap(GameRegistry.findBlock(ModInfo.ID, "BlockBoilingmud"));
}
}
else if (m.type == Type.ITEM)
{
if (m.name.contains("water"))
{
m.remap(Item.getItemFromBlock(GameRegistry.findBlock(ModInfo.ID, "BlockBoilingwater")));
}
else if (m.name.contains("mud"))
{
m.remap(Item.getItemFromBlock(GameRegistry.findBlock(ModInfo.ID, "BlockBoilingmud")));
}
}
}
}
@Override
public Object getInstance()
{

4
src/main/java/steamcraft/common/blocks/BlockBrassLeaves.java
View File

@ -12,9 +12,9 @@ import steamcraft.common.init.InitItems;
public class BlockBrassLeaves extends BaseBlock
{
public BlockBrassLeaves(Material mat)
public BlockBrassLeaves()
{
super(mat);
super(Material.iron);
this.setHarvestLevel("pickaxe", 2);
}

51
src/main/java/steamcraft/common/blocks/BlockBrassLog.java
View File

@ -1,51 +0,0 @@
package steamcraft.common.blocks;
import net.minecraft.block.BlockLog;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockBrassLog extends BlockLog
{
@SideOnly(Side.CLIENT)
private IIcon iconTop;
public BlockBrassLog(Material p_i45394_1_)
{
super();
this.setCreativeTab(Steamcraft.tabSC2);
}
@Override
@SideOnly(Side.CLIENT)
protected IIcon getSideIcon(int p_150163_1_)
{
return this.blockIcon;
}
@Override
@SideOnly(Side.CLIENT)
protected IIcon getTopIcon(int p_150161_1_)
{
return this.iconTop;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.blockIcon = ir.registerIcon(ModInfo.PREFIX + "blockBrassLogSide");
this.iconTop = ir.registerIcon(ModInfo.PREFIX + "blockBrassLogTop");
}
}

7
src/main/java/steamcraft/common/blocks/BlockCageLamp.java
View File

@ -1,7 +0,0 @@
package steamcraft.common.blocks;
public class BlockCageLamp
{
}

4
src/main/java/steamcraft/common/blocks/BlockCastIronRailing.java
View File

@ -30,9 +30,9 @@ import steamcraft.common.lib.ModInfo;
*/
public class BlockCastIronRailing extends BaseBlock
{
public BlockCastIronRailing(Material mat)
public BlockCastIronRailing()
{
super(mat);
super(Material.iron);
}
@Override

5
src/main/java/steamcraft/common/blocks/BlockCongealedSlime.java
View File

@ -11,9 +11,10 @@ import boilerplate.common.baseclasses.blocks.BaseBlock;
public class BlockCongealedSlime extends BaseBlock
{
public BlockCongealedSlime(Material mat)
public BlockCongealedSlime()
{
super(mat);
// TODO make this slime in 1.8
super(Material.gourd);
}
/**

2
src/main/java/steamcraft/common/blocks/BlockHatch.java
View File

@ -16,10 +16,10 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.client.renderers.tile.TileHatchRenderer.TileHatch;
import steamcraft.common.Steamcraft;
import steamcraft.common.blocks.machines.BaseContainerBlock;
/**
* @author Surseance

31
src/main/java/steamcraft/common/blocks/BlockMeltingIce.java
View File

@ -1,31 +0,0 @@
package steamcraft.common.blocks;
import java.util.Random;
import net.minecraft.block.BlockIce;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
public class BlockMeltingIce extends BlockIce
{
boolean meltsIntoWater;
public BlockMeltingIce(boolean meltsIntoWater)
{
this.meltsIntoWater = meltsIntoWater;
}
/**
* Ticks the block if it's been scheduled
*/
@Override
public void updateTick(World world, int x, int y, int z, Random random)
{
if (this.meltsIntoWater)
world.setBlock(x, y, z, Blocks.water);
else
world.setBlock(x, y, z, Blocks.air);
}
}

6
src/main/java/steamcraft/common/blocks/BlockTimeBomb.java
View File

@ -13,9 +13,9 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.common.Steamcraft;
import steamcraft.common.blocks.machines.BaseContainerBlock;
import steamcraft.common.lib.LoggerSteamcraft;
import steamcraft.common.lib.ModInfo;
import steamcraft.common.tiles.TileTimeBomb;
@ -84,8 +84,8 @@ public class BlockTimeBomb extends BaseContainerBlock
if ((ent != null) && (ent instanceof EntityPlayer))
{
EntityPlayer player = (EntityPlayer) ent;
LoggerSteamcraft.info("Time Bomb placed at X: " + Integer.toString(x) + " Y: " + Integer.toString(y) + " Z: " + Integer.toString(z)
+ " by player: " + player.getCommandSenderName());
LoggerSteamcraft.getLogger().info("Time Bomb placed at X: " + Integer.toString(x) + " Y: " + Integer.toString(y) + " Z: "
+ Integer.toString(z) + " by player: " + player.getCommandSenderName());
}
}

115
src/main/java/steamcraft/common/blocks/machines/BaseContainerBlock.java
View File

@ -1,115 +0,0 @@
package steamcraft.common.blocks.machines;
import java.util.ArrayList;
import java.util.Random;
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.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.BaseTileWithInventory;
import cofh.api.block.IDismantleable;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;
/**
* @author decebaldecebal
*
*/
public abstract class BaseContainerBlock extends BlockContainer implements IDismantleable
{
protected static boolean keepInventory = true;
protected BaseContainerBlock(Material mat)
{
super(mat);
this.setCreativeTab(Steamcraft.tabSC2);
this.setHardness(5.0F);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ir)
{
this.blockIcon = ir.registerIcon(ModInfo.PREFIX + this.getUnlocalizedName().substring(5));
}
@Override
public void breakBlock(World par1World, int par2, int par3, int par4, Block block, int par6)
{
if (!keepInventory)
{
TileEntity tile = par1World.getTileEntity(par2, par3, par4);
if ((tile != null) && (tile instanceof BaseTileWithInventory))
{
BaseTileWithInventory invTile = (BaseTileWithInventory) tile;
for (int var8 = 0; var8 < invTile.getSizeInventory(); ++var8)
{
ItemStack var9 = invTile.getStackInSlot(var8);
if (var9 != null)
{
Random random = par1World.rand;
float var10 = (random.nextFloat() * 0.8F) + 0.1F;
float var11 = (random.nextFloat() * 0.8F) + 0.1F;
float var12 = (random.nextFloat() * 0.8F) + 0.1F;
while (var9.stackSize > 0)
{
int var13 = random.nextInt(21) + 10;
if (var13 > var9.stackSize)
var13 = var9.stackSize;
var9.stackSize -= var13;
EntityItem var14 = new EntityItem(par1World, par2 + var10, par3 + var11, par4 + var12,
new ItemStack(var9.getItem(), var13, var9.getItemDamage()));
if (var9.hasTagCompound())
var14.getEntityItem().setTagCompound((NBTTagCompound) var9.getTagCompound().copy());
float var15 = 0.05F;
var14.motionX = (float) random.nextGaussian() * var15;
var14.motionY = ((float) random.nextGaussian() * var15) + 0.2F;
var14.motionZ = (float) random.nextGaussian() * var15;
par1World.spawnEntityInWorld(var14);
}
}
}
}
}
super.breakBlock(par1World, par2, par3, par4, block, par6);
}
@Override
public ArrayList<ItemStack> dismantleBlock(EntityPlayer player, World world, int x, int y, int z, boolean returnDrops)
{
this.breakBlock(world, x, y, z, this, 0);
ArrayList<ItemStack> localArrayList = new ArrayList<ItemStack>();
localArrayList.add(new ItemStack(this));
return localArrayList;
}
@Override
public boolean canDismantle(EntityPlayer player, World world, int x, int y, int z)
{
return (world.getTileEntity(x, y, z) != null) && (world.getTileEntity(x, y, z) instanceof BaseTileWithInventory);
}
}

1
src/main/java/steamcraft/common/blocks/machines/BlockArmorEditor.java
View File

@ -12,6 +12,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.Steamcraft;

2
src/main/java/steamcraft/common/blocks/machines/BlockBaseBoiler.java
View File

@ -14,6 +14,8 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
/**
* @author decebaldecebal
*

1
src/main/java/steamcraft/common/blocks/machines/BlockBattery.java
View File

@ -13,6 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.Steamcraft;

1
src/main/java/steamcraft/common/blocks/machines/BlockBloomery.java
View File

@ -18,6 +18,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.common.Steamcraft;
import steamcraft.common.lib.ModInfo;

1
src/main/java/steamcraft/common/blocks/machines/BlockCapacitor.java
View File

@ -10,6 +10,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.common.Steamcraft;
import steamcraft.common.tiles.energy.TileCapacitor;

1
src/main/java/steamcraft/common/blocks/machines/BlockCharger.java
View File

@ -13,6 +13,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.Steamcraft;

1
src/main/java/steamcraft/common/blocks/machines/BlockCopperPipe.java
View File

@ -10,6 +10,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.tiles.TileCopperPipe;

1
src/main/java/steamcraft/common/blocks/machines/BlockCopperTank.java
View File

@ -10,6 +10,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidContainerItem;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.tiles.TileCopperTank;

1
src/main/java/steamcraft/common/blocks/machines/BlockCopperWire.java
View File

@ -22,6 +22,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraftforge.common.util.ForgeDirection;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.DamageSourceHandler;

1
src/main/java/steamcraft/common/blocks/machines/BlockIntake.java
View File

@ -5,6 +5,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.common.tiles.TileIntake;
/**

1
src/main/java/steamcraft/common/blocks/machines/BlockLightningRod.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.lib.ModInfo;
import steamcraft.common.tiles.energy.TileLightningRod;

1
src/main/java/steamcraft/common/blocks/machines/BlockRefinery.java
View File

@ -15,6 +15,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.GuiIDs;
import steamcraft.common.Steamcraft;
import steamcraft.common.tiles.TileRefinery;

1
src/main/java/steamcraft/common/blocks/machines/BlockStasisField.java
View File

@ -5,6 +5,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.common.tiles.energy.TileStasisField;
/**

1
src/main/java/steamcraft/common/blocks/machines/BlockTeslaCoil.java
View File

@ -9,6 +9,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.lib.ModInfo;
import steamcraft.common.tiles.energy.TileTeslaCoil;

1
src/main/java/steamcraft/common/blocks/machines/BlockTurbine.java
View File

@ -10,6 +10,7 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseContainerBlock;
import steamcraft.common.lib.ModInfo;
import steamcraft.common.tiles.energy.TileTurbine;

8
src/main/java/steamcraft/common/compat/CompatabilityLayer.java
View File

@ -86,7 +86,7 @@ public class CompatabilityLayer
private static void sendTiConIMC()
{
LoggerSteamcraft.info("TiCon Detected, adding Etherium Tool Material");
LoggerSteamcraft.getLogger().info("TiCon Detected, adding Etherium Tool Material");
// Aluminum, Copper, Tin
for (int i = 0; i < 3; i++)
{
@ -141,7 +141,7 @@ public class CompatabilityLayer
private static void registerOreDictionaryEntries()
{
LoggerSteamcraft.info("Registering Thingies in OreDictionary");
LoggerSteamcraft.getLogger().info("Registering OreDictionary Entries");
OreDictHelper.registerOreWithAlts(InitItems.itemIngot, "ingotAluminum", "ingotAluminium");
OreDictHelper.registerOre("ingotCopper", InitItems.itemIngot, 1);
OreDictHelper.registerOre("ingotTin", InitItems.itemIngot, 2);
@ -262,7 +262,7 @@ public class CompatabilityLayer
private static void registerBiomeTypes()
{
LoggerSteamcraft.info("Registering Biome Dictionary entries");
LoggerSteamcraft.getLogger().info("Registering Biome Dictionary entries");
BiomeDictionary.registerBiomeType(InitBiomes.biomeDepths, BiomeDictionary.Type.HILLS);
BiomeDictionary.registerBiomeType(InitBiomes.biomeDepthsF, BiomeDictionary.Type.HILLS, BiomeDictionary.Type.FOREST);
BiomeDictionary.registerBiomeType(InitBiomes.biomeDepthsM, BiomeDictionary.Type.MOUNTAIN);
@ -280,7 +280,7 @@ public class CompatabilityLayer
{
if (Loader.isModLoaded("Thaumcraft"))
{
LoggerSteamcraft.info("Thaumcraft Detected. Loading Wizarding Module");
LoggerSteamcraft.getLogger().info("Thaumcraft Detected. Loading Wizarding Module");
GameRegistry.registerItem(InitItems.itemSteamcraftCluster, "ItemSteamcraftCluster");
GameRegistry.addSmelting(new ItemStack(InitItems.itemSteamcraftCluster, 1, 0), new ItemStack(InitItems.itemIngot, 2, 0), 0);

4
src/main/java/steamcraft/common/compat/CompatibilityHandler.java
View File

@ -33,11 +33,11 @@ public class CompatibilityHandler
if (!modCompat.areRequirementsMet() && modCompat.getIsActive())
{
modCompat.setIsActive(false);
LoggerSteamcraft.error("Requirements are not met for " + modCompat.getName() + ". Deactivating");
LoggerSteamcraft.getLogger().error("Requirements are not met for " + modCompat.getName() + ". Deactivating");
}
if (modCompat.getIsActive())
{
LoggerSteamcraft.info("Loading " + modCompat.getName() + " module");
LoggerSteamcraft.getLogger().info("Loading " + modCompat.getName() + " module");
}
}

2
src/main/java/steamcraft/common/config/ConfigGeneral.java
View File

@ -75,7 +75,7 @@ public class ConfigGeneral
new String[] { "Platinum", "Nickel", "Lead", "Silver", "" }, "");
} catch (Exception e)
{
LoggerSteamcraft.error("Failed to load configuration file:" + e);
LoggerSteamcraft.getLogger().error("Failed to load configuration file:" + e);
} finally
{
if (config.hasChanged())

2
src/main/java/steamcraft/common/config/ConfigWorldGen.java
View File

@ -87,7 +87,7 @@ public class ConfigWorldGen
slateCluster = config.get(CATEGORY_GEN_CLUSTERS, "Slate", 30).getInt();
} catch (Exception e)
{
LoggerSteamcraft.error("Failed to load configuration file:" + e);
LoggerSteamcraft.getLogger().error("Failed to load configuration file:" + e);
} finally
{
if (config.hasChanged())

30
src/main/java/steamcraft/common/init/InitBlocks.java
View File

@ -22,6 +22,7 @@ import boilerplate.common.baseclasses.blocks.BlockCustomSlab;
import boilerplate.common.baseclasses.blocks.BlockCustomStairs;
import boilerplate.common.baseclasses.blocks.BlockCustomWall;
import boilerplate.common.baseclasses.items.BaseMetadataItemBlock;
import boilerplate.common.blocks.BlockMeltingIce;
import boilerplate.common.compathandler.FMPCompatHandler;
import boilerplate.common.utils.helpers.RegistryHelper;
import org.apache.commons.lang3.text.WordUtils;
@ -29,7 +30,6 @@ import steamcraft.client.renderers.tile.TileHatchRenderer.TileHatch;
import steamcraft.common.Steamcraft;
import steamcraft.common.blocks.BlockBoulder;
import steamcraft.common.blocks.BlockBrassLeaves;
import steamcraft.common.blocks.BlockBrassLog;
import steamcraft.common.blocks.BlockCastIronFence;
import steamcraft.common.blocks.BlockCastIronGate;
import steamcraft.common.blocks.BlockCastIronLamp;
@ -44,7 +44,6 @@ import steamcraft.common.blocks.BlockInfestedGrass;
import steamcraft.common.blocks.BlockInvertedCastIronLamp;
import steamcraft.common.blocks.BlockLeafPile;
import steamcraft.common.blocks.BlockLightSlate;
import steamcraft.common.blocks.BlockMeltingIce;
import steamcraft.common.blocks.BlockMetal;
import steamcraft.common.blocks.BlockMetalLattice;
import steamcraft.common.blocks.BlockMossyMetal;
@ -262,7 +261,7 @@ public class InitBlocks
blockCastIronFence = new BlockCastIronFence().setBlockName("blockCastIronFence");
blockCastIronGate = new BlockCastIronGate().setBlockName("blockCastIronGate");
blockCastIronRailing = new BlockCastIronRailing(Material.anvil).setBlockName("blockCastIronRailing");
blockCastIronRailing = new BlockCastIronRailing().setBlockName("blockCastIronRailing");
registerBlock(blockCastIronFence, "BlockCastIronFence");
registerBlock(blockCastIronGate, "BlockCastIronGate");
@ -475,7 +474,7 @@ public class InitBlocks
blockFlesh = new BaseBlock(Material.gourd).setBlockName("blockFlesh").setCreativeTab(Steamcraft.tabSC2);
registerBlock(blockFlesh, "BlockFlesh");
blockCongealedSlime = new BlockCongealedSlime(Material.gourd).setBlockName("blockCongealedSlime").setCreativeTab(Steamcraft.tabSC2);
blockCongealedSlime = new BlockCongealedSlime().setBlockName("blockCongealedSlime").setCreativeTab(Steamcraft.tabSC2);
registerBlock(blockCongealedSlime, "BlockCongealedSlime");
// Standard
@ -581,37 +580,37 @@ public class InitBlocks
registerBlock(blockRedwoodFence, "BlockRedwoodFence");
blockMangroveFence = new BlockCustomFence("blockMangrovePlanks", Material.wood).setBlockName("blockMangroveFence");
registerBlock(blockMangroveFence, "blockMangroveFence");
registerBlock(blockMangroveFence, "BlockMangroveFence");
blockWillowFence = new BlockCustomFence("blockWillowPlanks", Material.wood).setBlockName("blockWillowFence");
registerBlock(blockWillowFence, "blockWillowFence");
registerBlock(blockWillowFence, "BlockWillowFence");
blockPetrifiedFence = new BlockCustomFence("blockPetrifiedPlanks", Material.wood).setBlockName("blockPetrifiedFence");
registerBlock(blockPetrifiedFence, "blockPetrifiedFence");
registerBlock(blockPetrifiedFence, "BlockPetrifiedFence");
blockRedwoodStairs = new BlockCustomStairs(blockRedwoodPlanks).setBlockName("blockRedwoodStairs");
registerBlock(blockRedwoodStairs, "BlockRedwoodStairs");
blockMangroveStairs = new BlockCustomStairs(blockMangrovePlanks).setBlockName("blockMangroveStairs");
registerBlock(blockMangroveStairs, "blockMangroveStairs");
registerBlock(blockMangroveStairs, "BlockMangroveStairs");
blockWillowStairs = new BlockCustomStairs(blockWillowPlanks).setBlockName("blockWillowStairs");
registerBlock(blockWillowStairs, "blockWillowStairs");
registerBlock(blockWillowStairs, "BlockWillowStairs");
blockPetrifiedStairs = new BlockCustomStairs(blockPetrifiedPlanks).setBlockName("blockPetrifiedStairs");
registerBlock(blockPetrifiedStairs, "blockPetrifiedStairs");
registerBlock(blockPetrifiedStairs, "BlockPetrifiedStairs");
blockRedwoodSlab = new BlockCustomSlab("blockRedwoodPlanks", blockRedwoodPlanks, Material.wood).setBlockName("blockRedwoodSlab");
registerBlock(blockRedwoodSlab, "BlockRedwoodSlab");
blockMangroveSlab = new BlockCustomSlab("blockMangrovePlanks", blockMangrovePlanks, Material.wood).setBlockName("blockMangroveSlab");
registerBlock(blockMangroveSlab, "blockMangroveSlab");
registerBlock(blockMangroveSlab, "BlockMangroveSlab");
blockWillowSlab = new BlockCustomSlab("blockWillowPlanks", blockWillowPlanks, Material.wood).setBlockName("blockWillowSlab");
registerBlock(blockWillowSlab, "blockWillowSlab");
registerBlock(blockWillowSlab, "BlockWillowSlab");
blockPetrifiedSlab = new BlockCustomSlab("blockPetrifiedPlanks", blockPetrifiedPlanks, Material.wood).setBlockName("blockPetrifiedSlab");
registerBlock(blockPetrifiedSlab, "blockPetrifiedSlab");
registerBlock(blockPetrifiedSlab, "BlockPetrifiedSlab");
blockRedwoodDoubleSlab = new BlockCustomDoubleSlab("blockRedwoodPlanks", blockRedwoodPlanks, Material.wood, blockRedwoodSlab)
.setBlockName("blockRedwoodDoubleSlab");
@ -645,8 +644,9 @@ public class InitBlocks
registerBlock(blockTintedRock, "BlockTintedRock");
// Wood
blockBrassLog = new BlockBrassLog(Material.iron).setBlockName("blockBrassLog");
blockBrassLeaves = new BlockBrassLeaves(Material.iron).setBlockName("blockBrassLeaves");
// TODO
blockBrassLog = new BlockCustomLog("Brass").setBlockName("blockBrassLog");
blockBrassLeaves = new BlockBrassLeaves().setBlockName("blockBrassLeaves");
registerBlock(blockBrassLog, "BlockBrassLog");
registerBlock(blockBrassLeaves, "BlockBrassLeaves");

50
src/main/java/steamcraft/common/lib/LoggerSteamcraft.java
View File

@ -1,6 +1,9 @@
package steamcraft.common.lib;
import net.minecraftforge.classloading.FMLForgePlugin;
import boilerplate.common.utils.ILogger;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -9,32 +12,65 @@ import org.apache.logging.log4j.Logger;
* @author Surseance
*
*/
public class LoggerSteamcraft
// TODO: genericise
public class LoggerSteamcraft implements ILogger
{
private static final Logger logger = LogManager.getLogger("Steamcraft");
public static void log(org.apache.logging.log4j.Level level, String message)
public static Logger getLogger()
{
logger.log(level, message);
return logger;
}
public static void warning(String message)
@Override
public void warning(String message)
{
logger.log(Level.WARN, message);
}
public static void info(String message)
@Override
public void info(String message)
{
logger.log(Level.INFO, message);
}
public static void fatal(String message)
@Override
public void fatal(String message)
{
logger.log(Level.FATAL, message);
}
public static void error(String message)
@Override
public void error(String message)
{
logger.log(Level.ERROR, message);
}
@Override
public void devWarning(String message)
{
if (FMLForgePlugin.RUNTIME_DEOBF)
logger.log(Level.WARN, message);
}
@Override
public void devInfo(String message)
{
if (FMLForgePlugin.RUNTIME_DEOBF)
logger.log(Level.INFO, message);
}
@Override
public void devFatal(String message)
{
if (FMLForgePlugin.RUNTIME_DEOBF)
logger.log(Level.FATAL, message);
}
@Override
public void devError(String message)
{
if (FMLForgePlugin.RUNTIME_DEOBF)
logger.log(Level.ERROR, message);
}
}

53
src/main/java/steamcraft/common/worldgen/WorldGenBlockgroup.java
View File

@ -1,53 +0,0 @@
package steamcraft.common.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenBlockgroup extends WorldGenerator
{
private final Block blockToGen;
private final int numberOfBlocks;
public WorldGenBlockgroup(Block block, int p_i2011_1_)
{
this.blockToGen = block;
this.numberOfBlocks = p_i2011_1_;
}
@Override
public boolean generate(World world, Random random, int x, int y, int z)
{
int l = random.nextInt(this.numberOfBlocks);
byte b0 = 1;
boolean flag = false;
for (int i1 = x - l; i1 <= (x + l); ++i1)
{
for (int j1 = z - l; j1 <= (z + l); ++j1)
{
int k1 = i1 - x;
int l1 = j1 - z;
if (((k1 * k1) + (l1 * l1)) <= (l * l))
{
for (int i2 = y - b0; i2 <= (y + b0); ++i2)
{
Block block = world.getBlock(i1, i2, j1);
if ((block == Blocks.dirt) || (block == Blocks.grass) || (block == Blocks.stone))
{
world.setBlock(i1, i2, j1, this.blockToGen, 0, 2);
flag = true;
}
}
}
}
}
return flag;
}
}

43
src/main/java/steamcraft/common/worldgen/WorldGenRandomUnderground.java
View File

@ -1,43 +0,0 @@
package steamcraft.common.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
public class WorldGenRandomUnderground extends WorldGenerator
{
private Block toGen;
private int metaToGen;
public WorldGenRandomUnderground(Block block)
{
this(block, 0);
}
public WorldGenRandomUnderground(Block block, int meta)
{
this.toGen = block;
this.metaToGen = meta;
}
@Override
public boolean generate(World world, Random random, int x, int y, int z)
{
for (int l = 0; l < 16; ++l)
{
int xPos = (x + random.nextInt(8)) - random.nextInt(8);
int yPos = (y + random.nextInt(4)) - random.nextInt(4);
int zPos = (z + random.nextInt(8)) - random.nextInt(8);
if (world.isAirBlock(xPos, yPos, zPos) && this.toGen.canBlockStay(world, xPos, yPos, zPos) && this.toGen.canPlaceBlockAt(world, x, y, z))
{
world.setBlock(xPos, yPos, zPos, this.toGen, this.metaToGen, 2);
}
}
return true;
}
}

52
src/main/java/steamcraft/common/worldgen/WorldGenSteamcraft.java
View File

@ -3,18 +3,17 @@ package steamcraft.common.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
import cpw.mods.fml.common.IWorldGenerator;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.BiomeDictionary.Type;
import boilerplate.common.utils.WorldGenUtils;
import steamcraft.common.config.ConfigGeneral;
import steamcraft.common.config.ConfigWorldGen;
import steamcraft.common.init.InitBlocks;
@ -44,34 +43,44 @@ public class WorldGenSteamcraft implements IWorldGenerator
private void generateSurface(World world, Random random, int chunkX, int chunkZ)
{
if (ConfigWorldGen.aluminumOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 10, 20, 40, ConfigWorldGen.aluminumCluster, InitBlocks.blockCustomOre, 0, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 10, 20, 40, ConfigWorldGen.aluminumCluster, InitBlocks.blockCustomOre, 0,
Blocks.stone);
if (ConfigWorldGen.copperOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 15, 22, 45, ConfigWorldGen.copperCluster, InitBlocks.blockCustomOre, 1, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 15, 22, 45, ConfigWorldGen.copperCluster, InitBlocks.blockCustomOre, 1,
Blocks.stone);
if (ConfigWorldGen.tinOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 15, 22, 45, ConfigWorldGen.tinCluster, InitBlocks.blockCustomOre, 2, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 15, 22, 45, ConfigWorldGen.tinCluster, InitBlocks.blockCustomOre, 2,
Blocks.stone);
if (ConfigWorldGen.zincOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 12, 20, 36, ConfigWorldGen.zincCluster, InitBlocks.blockCustomOre, 3, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 12, 20, 36, ConfigWorldGen.zincCluster, InitBlocks.blockCustomOre, 3,
Blocks.stone);
if (ConfigWorldGen.uraniumOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 1, 4, 24, ConfigWorldGen.uraniumCluster, InitBlocks.blockCustomOre, 4, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 4, 24, ConfigWorldGen.uraniumCluster, InitBlocks.blockCustomOre, 4,
Blocks.stone);
if (ConfigWorldGen.brimstoneOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 5, 20, 64, ConfigWorldGen.brimstoneCluster, InitBlocks.blockCustomOre, 5, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 5, 20, 64, ConfigWorldGen.brimstoneCluster, InitBlocks.blockCustomOre, 5,
Blocks.stone);
if (ConfigWorldGen.phosphateOreGenEnabled)
this.generateOre(world, random, chunkX, chunkZ, 7, 20, 36, ConfigWorldGen.phosphateCluster, InitBlocks.blockCustomOre, 6, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 7, 20, 36, ConfigWorldGen.phosphateCluster, InitBlocks.blockCustomOre, 6,
Blocks.stone);
if (ConfigWorldGen.slateGenEnabled)
{
this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 0, Blocks.stone);
this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 1, Blocks.stone);
this.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 2, Blocks.stone);
this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 0, Blocks.stone);
this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 1, Blocks.stone);
this.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 2, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 0, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 1, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 10, 40, ConfigWorldGen.slateCluster, InitBlocks.blockSlate, 2, Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 0,
Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 1,
Blocks.stone);
WorldGenUtils.generateOre(world, random, chunkX, chunkZ, 1, 40, 70, ConfigWorldGen.slateCluster, InitBlocks.blockLightSlate, 2,
Blocks.stone);
}
if (ConfigWorldGen.brassTreeGenEnabled)
@ -97,17 +106,4 @@ public class WorldGenSteamcraft implements IWorldGenerator
new WorldGenFissurePortal().generate(world, random, X, Y, Z);
}
}
private void generateOre(World world, Random random, int chunkX, int chunkZ, int blockPerChunk, int minHeight, int maxHeight, int blocks,
Block ore, int meta, Block blockToGenIn)
{
for (int i = 0; i < blockPerChunk; i++)
{
int oreXCoord = chunkX + random.nextInt(16);
int oreYCoord = minHeight + random.nextInt(maxHeight - minHeight);
int oreZCoord = chunkZ + random.nextInt(16);
new WorldGenMinable(ore, meta, blocks, blockToGenIn).generate(world, random, oreXCoord, oreYCoord, oreZCoord);
}
}
}

2
src/main/java/steamcraft/common/worldgen/biomes/BiomeDepthsInfestation.java
View File

@ -7,8 +7,8 @@ import net.minecraft.init.Blocks;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import boilerplate.common.worldgen.WorldGenBlockgroup;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.worldgen.WorldGenBlockgroup;
public class BiomeDepthsInfestation extends BiomeDepthsBase
{

2
src/main/java/steamcraft/common/worldgen/biomes/BiomeDepthsSwamp.java
View File

@ -16,8 +16,8 @@ import net.minecraft.world.gen.feature.WorldGenVines;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.worldgen.WorldGenBlockgroup;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.worldgen.WorldGenBlockgroup;
import steamcraft.common.worldgen.WorldGenLeafPile;
import steamcraft.common.worldgen.trees.WorldGenDeadTree;
import steamcraft.common.worldgen.trees.WorldGenMangroveTree;

4
src/main/java/steamcraft/common/worldgen/biomes/DepthsBiomeDecorator.java
View File

@ -22,9 +22,9 @@ import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.event.terraingen.DeferredBiomeDecorator;
import boilerplate.common.worldgen.WorldGenBlockgroup;
import boilerplate.common.worldgen.WorldGenRandomUnderground;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.worldgen.WorldGenBlockgroup;
import steamcraft.common.worldgen.WorldGenRandomUnderground;
import steamcraft.common.worldgen.structure.WorldGenUndergroundHouse;
public class DepthsBiomeDecorator extends DeferredBiomeDecorator