TContent refactor Part 1

This commit is contained in:
Progwml6 committed 2013-11-29 23:16:32 -05:00
1 parent 241bfcf0d5
commit 1a74c0768f
77 files changed
+1884 -5647

No files matched your search

@@ -11,7 +11,7 @@ import net.minecraft.world.WorldType;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderFlat;
import net.minecraft.world.gen.feature.WorldGenerator;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.util.config.DimensionBlacklist;
import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.common.IWorldGenerator;
@@ -22,8 +22,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
private int gelMeta;
int randomness = 2;
Random random = new Random();
int baseID = TContent.craftedSoil.blockID;//Block.dirt.blockID;
int topID = TContent.slimeGrass.blockID;
int baseID = TRepo.craftedSoil.blockID;//Block.dirt.blockID;
int topID = TRepo.slimeGrass.blockID;
SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0);
public SlimeIslandGen(int id, int meta)
@@ -145,7 +145,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
{
generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2);
}
PlantGen tallGrass = new PlantGen(TContent.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false);
PlantGen tallGrass = new PlantGen(TRepo.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false);
tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk);
for (int i = 0; i < 3; i++)
{
@@ -287,7 +287,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlockMaterial(x + xPos, y + yPos, z + zPos).isSolid()
&& world.getBlockMaterial(x + xPos, y + yPos + 1, z + zPos) != Material.water)
{
world.setBlock(x + xPos, y + yPos, z + zPos, TContent.slimeGel.blockID, gelMeta, 2);
world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel.blockID, gelMeta, 2);
}
}
}
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import net.minecraftforge.common.ForgeDirection;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
public class SlimeTreeGen extends WorldGenerator
{
@@ -42,7 +42,7 @@ public class SlimeTreeGen extends WorldGenerator
if (yPos >= 1 && yPos + height + 1 <= 256)
{
Block soil = Block.blocksList[world.getBlockId(xPos, yPos - 1, zPos)];
boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TContent.slimeSapling));
boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling));
if (isSoil)
{
@@ -75,7 +75,7 @@ public class SlimeTreeGen extends WorldGenerator
{
int blockID = world.getBlockId(x + xPos, y + yPos, z + zPos);
Block block = Block.blocksList[blockID];
if (block != null && blockID != TContent.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos))
if (block != null && blockID != TRepo.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos))
return false;
}
}
@@ -90,7 +90,7 @@ public class SlimeTreeGen extends WorldGenerator
do
{
int heightID = world.getBlockId(x, height, z);
if ((heightID == TContent.craftedSoil.blockID || heightID == TContent.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)])
if ((heightID == TRepo.craftedSoil.blockID || heightID == TRepo.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)])
{
ret = height + 1;
break;
@@ -117,23 +117,23 @@ public class SlimeTreeGen extends WorldGenerator
this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, 0, 0);
//Drippers
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
}
void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range)
@@ -144,7 +144,7 @@ public class SlimeTreeGen extends WorldGenerator
{
if (Math.abs(x) + Math.abs(z) <= range)
{
this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
}
}
}
@@ -160,7 +160,7 @@ public class SlimeTreeGen extends WorldGenerator
if (blockID == 0 || block == null || block.isLeaves(world, xPos, yPos + localHeight, zPos))
{
this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TContent.slimeGel.blockID, this.metaWood);
this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel.blockID, this.metaWood);
}
}
}
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.common.IWorldGenerator;
@@ -16,19 +16,19 @@ public class TBaseWorldGenerator implements IWorldGenerator
{
public TBaseWorldGenerator()
{
copper = new WorldGenMinable(TContent.oreSlag.blockID, 3, 8, Block.stone.blockID);
tin = new WorldGenMinable(TContent.oreSlag.blockID, 4, 8, Block.stone.blockID);
aluminum = new WorldGenMinable(TContent.oreSlag.blockID, 5, 6, Block.stone.blockID);
copper = new WorldGenMinable(TRepo.oreSlag.blockID, 3, 8, Block.stone.blockID);
tin = new WorldGenMinable(TRepo.oreSlag.blockID, 4, 8, Block.stone.blockID);
aluminum = new WorldGenMinable(TRepo.oreSlag.blockID, 5, 6, Block.stone.blockID);
cobalt = new WorldGenMinable(TContent.oreSlag.blockID, 1, 3, Block.netherrack.blockID);
ardite = new WorldGenMinable(TContent.oreSlag.blockID, 2, 3, Block.netherrack.blockID);
cobalt = new WorldGenMinable(TRepo.oreSlag.blockID, 1, 3, Block.netherrack.blockID);
ardite = new WorldGenMinable(TRepo.oreSlag.blockID, 2, 3, Block.netherrack.blockID);
ironBush = new OreberryBushGen(TContent.oreBerry.blockID, 12, 12);
goldBush = new OreberryBushGen(TContent.oreBerry.blockID, 13, 6);
copperBush = new OreberryBushGen(TContent.oreBerry.blockID, 14, 12);
tinBush = new OreberryBushGen(TContent.oreBerry.blockID, 15, 12);
aluminumBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 12, 14);
silverBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 13, 8);
ironBush = new OreberryBushGen(TRepo.oreBerry.blockID, 12, 12);
goldBush = new OreberryBushGen(TRepo.oreBerry.blockID, 13, 6);
copperBush = new OreberryBushGen(TRepo.oreBerry.blockID, 14, 12);
tinBush = new OreberryBushGen(TRepo.oreBerry.blockID, 15, 12);
aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 12, 14);
silverBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 13, 8);
}
@Override
@@ -6,7 +6,7 @@ import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.Ev
import java.util.Random;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import tconstruct.util.config.PHConstruct;
import net.minecraft.world.World;
@@ -19,12 +19,12 @@ import com.google.common.collect.ImmutableList;
public class TerrainGenEventHandler
{
private final SurfaceOreGen ironSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 0, 12, true);
private final SurfaceOreGen goldSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 1, 20, true);
private final SurfaceOreGen copperSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 2, 12, true);
private final SurfaceOreGen tinSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 3, 12, true);
private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 4, 12, true);
private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 5, 30, true);
private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 0, 12, true);
private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 1, 20, true);
private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 2, 12, true);
private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 3, 12, true);
private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 4, 12, true);
private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 5, 30, true);
private static ImmutableCollection<BiomeGenBase> EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge);
@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Random;
import tconstruct.TConstruct;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import net.minecraft.block.Block;
import net.minecraft.world.World;
@@ -64,13 +64,13 @@ public class ComponentSmeltery extends ComponentVillage
this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Block.stoneBrick.blockID, Block.stoneBrick.blockID, false);
this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, 0, 0, false);
this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TContent.smeltery.blockID, 2, TContent.smeltery.blockID, 2, false); //Basin
this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery.blockID, 2, TRepo.smeltery.blockID, 2, false); //Basin
this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, 0, 0, false);
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 1, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 7, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 7, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 2, 1, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 7, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 2, 7, 1, 4, sbb);
for (int l = 1; l < 6; ++l)
{
@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Random;
import tconstruct.blocks.logic.PatternChestLogic;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import net.minecraft.block.Block;
import net.minecraft.util.WeightedRandomChestContent;
@@ -121,16 +121,16 @@ public class ComponentToolWorkshop extends ComponentVillage
this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 3, 5, sbb);
this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 4, 5, sbb);
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside
this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TContent.tinkerHousePatterns.getItems(random), TContent.tinkerHousePatterns.getCount(random));
//this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 5, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 1, 1, 1, 3, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside
this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random));
//this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 5, 1, 1, 2, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 1, 1, 1, 3, sbb);
this.placeBlockAtCurrentPosition(world, Block.workbench.blockID, 0, 1, 1, 4, sbb);
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 10, 1, 1, 5, sbb);
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 10, 1, 1, 5, sbb);
//ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse");
this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TContent.tinkerHouseChest.getItems(random), TContent.tinkerHouseChest.getCount(random));
this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random));
//this.placeBlockAtCurrentPosition(world, Block.chest.blockID, i, 4, 1, 5, sbb);
i = this.getMetadataWithOffset(Block.pistonBase.blockID, 3);
this.placeBlockAtCurrentPosition(world, Block.pistonBase.blockID, i, 5, 1, 5, sbb);
@@ -157,7 +157,7 @@ public class ComponentToolWorkshop extends ComponentVillage
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Block.chest.blockID)
{
world.setBlock(posX, posY, posZ, TContent.toolStationWood.blockID, 5, 2);
world.setBlock(posX, posY, posZ, TRepo.toolStationWood.blockID, 5, 2);
PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(posX, posY, posZ);
if (logic != null)
@@ -9,7 +9,7 @@ import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.item.ItemStack;
import net.minecraft.village.MerchantRecipe;
import net.minecraft.village.MerchantRecipeList;
import tconstruct.common.TContent;
import tconstruct.common.TRepo;
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
public class TVillageTrades implements IVillageTradeHandler
@@ -28,18 +28,18 @@ public class TVillageTrades implements IVillageTradeHandler
allowedIngredients.add(new ItemStack(Block.pistonStickyBase, 64));
// tconstruct blocks
allowedIngredients.add(new ItemStack(TContent.barricadeBirch, 64));
allowedIngredients.add(new ItemStack(TContent.barricadeJungle, 64));
allowedIngredients.add(new ItemStack(TContent.barricadeOak, 64));
allowedIngredients.add(new ItemStack(TContent.barricadeSpruce, 64));
allowedIngredients.add(new ItemStack(TContent.punji, 64));
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 0));
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 1));
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 5));
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 10));
allowedIngredients.add(new ItemStack(TRepo.barricadeBirch, 64));
allowedIngredients.add(new ItemStack(TRepo.barricadeJungle, 64));
allowedIngredients.add(new ItemStack(TRepo.barricadeOak, 64));
allowedIngredients.add(new ItemStack(TRepo.barricadeSpruce, 64));
allowedIngredients.add(new ItemStack(TRepo.punji, 64));
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 0));
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 1));
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 5));
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 10));
for (int sc = 0; sc < 4; sc++)
{
allowedIngredients.add(new ItemStack(TContent.landmine, 64, sc));
allowedIngredients.add(new ItemStack(TRepo.landmine, 64, sc));
}
}
@@ -65,14 +65,14 @@ public class TVillageTrades implements IVillageTradeHandler
{
ingredient2 = null;
}
result = new ItemStack(TContent.oreBerry, calcStackSize(ingredient, ingredient2), sc);
result = new ItemStack(TRepo.oreBerry, calcStackSize(ingredient, ingredient2), sc);
// adds iron, gold, copper & tin orebushes to the recipe list
recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result));
if (sc == 8)
{
// adds alumine orebush to the recipe list
result = new ItemStack(TContent.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc);
result = new ItemStack(TRepo.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc);
recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result));
}
}