Skip to content

Commit

Permalink
Titanium Tool parts now require the correct amount of fluids Fixes #190
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshiejack
joshiejack committed Sep 10, 2014
1 parent 3787bb5 commit be0e78c
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 34 deletions.
Binary file renamed ...Construct-1.7.10-1.6.0.build625-deobf.jar → ...Construct-1.7.10-1.6.0.build634-deobf.jar
View file
Binary file not shown.
8 changes: 8 additions & 0 deletions src/main/java/joshie/mariculture/fishery/fish/FishLungfish.java
View file
Expand Up @@ -5,6 +5,9 @@
import joshie.mariculture.api.core.Environment.Salinity;
import joshie.mariculture.api.fishery.RodType;
import joshie.mariculture.api.fishery.fish.FishSpecies;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;

public class FishLungfish extends FishSpecies {
Expand Down Expand Up @@ -62,6 +65,11 @@ public void addFishProducts() {
public double getFishOilVolume() {
return 4.3D;
}

@Override
public void affectLiving(EntityLivingBase entity) {
entity.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 1, 500));
}

@Override
public RodType getRodNeeded() {
Expand Down
57 changes: 31 additions & 26 deletions src/main/java/joshie/mariculture/plugins/tconstruct/TitaniumTools.java
View file
@@ -1,5 +1,6 @@
package joshie.mariculture.plugins.tconstruct;

import static joshie.mariculture.core.lib.MetalRates.*;
import joshie.lib.helpers.RegistryHelper;
import joshie.mariculture.core.lib.MetalRates;
import joshie.mariculture.core.util.Fluids;
Expand Down Expand Up @@ -69,7 +70,7 @@ public static void preInit() {
}

public static void postInit() {
addCastings(titanium_id, Fluids.getFluidStack("titanium", MetalRates.INGOT), 80);
addCastings(titanium_id, 80);

//Register Titanium with Patterns
if (OreDictionary.getOres("ingotTitanium").size() > 0) {
Expand All @@ -81,36 +82,40 @@ public static void postInit() {
addTools();

int level = Loader.isModLoaded("IguanaTweaks") ? 5 : 4;
TConstructRegistry.addToolMaterial(titanium_id, "Titanium", level, 650, 1500, 2, 1.5F, 2, 0.0F, "", "");
TConstructRegistry.addToolMaterial(titanium_id, "Titanium", level, 650, 1500, 2, 1.5F, 2, 0.0F, "", 0xFFFFFF);
TConstructClientRegistry.addMaterialRenderMapping(titanium_id, "Mariculture", "titanium", true);
TConstructRegistry.addBowMaterial(titanium_id, 768, 40, 1.2F);
TConstructRegistry.addArrowMaterial(titanium_id, 5.0F, 0.25F, 100.0F);
}

private static FluidStack titanium(int value) {
return Fluids.getFluidStack("titanium", value);
}

public static void addCastings(int id, FluidStack fluid, int delay) {
PluginTConstruct.addPartCasting(new ItemStack(tool_rod, 1, id), TConstructRegistry.getItemStack("toolRodCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(pickaxe_head, 1, id), TConstructRegistry.getItemStack("pickaxeHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(shovel_head, 1, id), TConstructRegistry.getItemStack("shovelHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(axe_head, 1, id), TConstructRegistry.getItemStack("hatchetHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(sword_blade, 1, id), TConstructRegistry.getItemStack("swordBladeCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(large_guard, 1, id), TConstructRegistry.getItemStack("wideGuardCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(hand_guard, 1, id), TConstructRegistry.getItemStack("handGuardCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(crossbar, 1, id), TConstructRegistry.getItemStack("crossBarCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(binding, 1, id), TConstructRegistry.getItemStack("bindingCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(frypan_head, 1, id), TConstructRegistry.getItemStack("frypanHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(battle_sign_head, 1, id), TConstructRegistry.getItemStack("signHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(knife_blade, 1, id), TConstructRegistry.getItemStack("knifeBladeCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(chisel_head, 1, id), TConstructRegistry.getItemStack("chiselHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(tough_rod, 1, id), TConstructRegistry.getItemStack("toughRodCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(tough_binding, 1, id), TConstructRegistry.getItemStack("toughBindingCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(large_plate, 1, id), TConstructRegistry.getItemStack("largePlateCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(broad_axe_head, 1, id), TConstructRegistry.getItemStack("broadAxeHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(scythe_head, 1, id), TConstructRegistry.getItemStack("scytheHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(excavator_head, 1, id), TConstructRegistry.getItemStack("excavatorHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(large_sword_blade, 1, id), TConstructRegistry.getItemStack("largeBladeCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(hammer_head, 1, id), TConstructRegistry.getItemStack("hammerHeadCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(full_guard, 1, id), TConstructRegistry.getItemStack("fullGuardCast"), fluid, delay);
PluginTConstruct.addPartCasting(new ItemStack(arrowhead, 1, id), new ItemStack(TConstructRegistry.getItem("metalPattern"), 1, 25), fluid, delay);
public static void addCastings(int id, int delay) {
PluginTConstruct.addPartCasting(new ItemStack(tool_rod, 1, id), TConstructRegistry.getItemStack("toolRodCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(pickaxe_head, 1, id), TConstructRegistry.getItemStack("pickaxeHeadCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(shovel_head, 1, id), TConstructRegistry.getItemStack("shovelHeadCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(axe_head, 1, id), TConstructRegistry.getItemStack("hatchetHeadCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(sword_blade, 1, id), TConstructRegistry.getItemStack("swordBladeCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(large_guard, 1, id), TConstructRegistry.getItemStack("wideGuardCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(hand_guard, 1, id), TConstructRegistry.getItemStack("handGuardCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(crossbar, 1, id), TConstructRegistry.getItemStack("crossbarCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(binding, 1, id), TConstructRegistry.getItemStack("bindingCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(frypan_head, 1, id), TConstructRegistry.getItemStack("frypanHeadCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(battle_sign_head, 1, id), TConstructRegistry.getItemStack("signHeadCast"), titanium(INGOT), delay);
PluginTConstruct.addPartCasting(new ItemStack(knife_blade, 1, id), TConstructRegistry.getItemStack("knifeBladeCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(chisel_head, 1, id), TConstructRegistry.getItemStack("chiselHeadCast"), titanium(INGOT/2), delay);
PluginTConstruct.addPartCasting(new ItemStack(tough_rod, 1, id), TConstructRegistry.getItemStack("toughRodCast"), titanium(INGOT*3), delay);
PluginTConstruct.addPartCasting(new ItemStack(tough_binding, 1, id), TConstructRegistry.getItemStack("toughBindingCast"), titanium(INGOT*3), delay);
PluginTConstruct.addPartCasting(new ItemStack(large_plate, 1, id), TConstructRegistry.getItemStack("largePlateCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(broad_axe_head, 1, id), TConstructRegistry.getItemStack("broadAxeHeadCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(scythe_head, 1, id), TConstructRegistry.getItemStack("scytheHeadCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(excavator_head, 1, id), TConstructRegistry.getItemStack("excavatorHeadCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(large_sword_blade, 1, id), TConstructRegistry.getItemStack("largeBladeCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(hammer_head, 1, id), TConstructRegistry.getItemStack("hammerHeadCast"), titanium(INGOT*8), delay);
PluginTConstruct.addPartCasting(new ItemStack(full_guard, 1, id), TConstructRegistry.getItemStack("fullGuardCast"), titanium(INGOT*3), delay);
PluginTConstruct.addPartCasting(new ItemStack(arrowhead, 1, id), new ItemStack(TConstructRegistry.getItem("metalPattern"), 1, 25), titanium(INGOT), delay);
}

public static void addTools() {
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/joshie/mariculture/world/decorate/WorldGenAncientSand.java
View file
Expand Up @@ -14,19 +14,19 @@

public class WorldGenAncientSand extends WorldGenerator {
@Override
public boolean generate(World world, Random par2Random, int par3, int par4, int par5) {
if (BlockHelper.getBlock(world, par3, par4, par5).getMaterial() != Material.water) return false;
public boolean generate(World world, Random rand, int x, int y, int z) {
if (BlockHelper.getBlock(world, x, y, z).getMaterial() != Material.water) return false;
else {
int l = par2Random.nextInt(WorldGen.ANCIENT_SAND_SIZE - 2) + 2;
int l = rand.nextInt(WorldGen.ANCIENT_SAND_SIZE - 2) + 2;
byte b0 = 2;

for (int i1 = par3 - l; i1 <= par3 + l; ++i1) {
for (int j1 = par5 - l; j1 <= par5 + l; ++j1) {
int k1 = i1 - par3;
int l1 = j1 - par5;
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 = par4 - b0; i2 <= par4 + b0; ++i2) {
for (int i2 = y - b0; i2 <= y + b0; ++i2) {
Block block = BlockHelper.getBlock(world, i1, i2, j1);
if (block == Blocks.dirt || block == Blocks.grass || block == Blocks.sand || block == Blocks.gravel) {
world.setBlock(i1, i2, j1, Core.sands, GroundMeta.ANCIENT, 2);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/joshie/mariculture/world/decorate/WorldGenReef.java
View file
Expand Up @@ -22,6 +22,7 @@ private void setBlock(ArrayList<String> cache, World world, int x, int y, int z)
if (!cache.contains(coords)) {
cache.add(coords);
}

world.setBlock(x, y, z, Core.rocks);
}

Expand Down

0 comments on commit be0e78c

Please sign in to comment.