Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Removed dev block helper. Fixed trait cascade not to break whole mountains.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-28 13:08:55 +02:00
parent 195b6a25dc
commit e6f95908d7
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sosnitzka/taiga/TAIGA.java
View File

@@ -1,14 +1,12 @@
package com.sosnitzka.taiga; package com.sosnitzka.taiga;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.sosnitzka.taiga.dev.BlockHandler;
import com.sosnitzka.taiga.proxy.CommonProxy; import com.sosnitzka.taiga.proxy.CommonProxy;
import com.sosnitzka.taiga.recipes.CraftingRegistry; import com.sosnitzka.taiga.recipes.CraftingRegistry;
import com.sosnitzka.taiga.recipes.SmeltingRegistry; import com.sosnitzka.taiga.recipes.SmeltingRegistry;
import com.sosnitzka.taiga.util.FuelHandler; import com.sosnitzka.taiga.util.FuelHandler;
import com.sosnitzka.taiga.world.ZWorldGen; import com.sosnitzka.taiga.world.ZWorldGen;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -31,9 +29,7 @@ import java.util.List;
import static com.sosnitzka.taiga.Fluids.*; import static com.sosnitzka.taiga.Fluids.*;
import static com.sosnitzka.taiga.MaterialTraits.*; import static com.sosnitzka.taiga.MaterialTraits.*;
import static com.sosnitzka.taiga.TAIGAConfiguration.attackFactorGeneral; import static com.sosnitzka.taiga.TAIGAConfiguration.*;
import static com.sosnitzka.taiga.TAIGAConfiguration.durabilityFactorGeneral;
import static com.sosnitzka.taiga.TAIGAConfiguration.speedFactorGeneral;
import static slimeknights.tconstruct.library.utils.HarvestLevels.*; import static slimeknights.tconstruct.library.utils.HarvestLevels.*;
@Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = "required-after:tconstruct@[1.10-2.3.3,);" + "required-after:mantle@[1.10-0.10.3,)") @Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = "required-after:tconstruct@[1.10-2.3.3,);" + "required-after:mantle@[1.10-0.10.3,)")
@@ -50,7 +46,6 @@ public class TAIGA {
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
MinecraftForge.EVENT_BUS.register(new BlockHandler());
proxy.initConfig(); proxy.initConfig();
Items.register(); // Registers items and its oreDict Items.register(); // Registers items and its oreDict

3
src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java
View File

@@ -23,7 +23,8 @@ public class TraitCascade extends AbstractTrait {
sx = x = pos.getX(); sx = x = pos.getX();
sy = y = pos.getY(); sy = y = pos.getY();
sz = z = pos.getZ(); sz = z = pos.getZ();
for (int i = random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * 1.5f)); i > 0; i--) { // TODO: limit to 100 int i = random.nextInt((int) Math.min(300f * (float) ToolHelper.getCurrentDurability(tool) / ToolHelper.getMaxDurability(tool), 50f));
for (int a = i; a > 0; a--) {
int r = random.nextInt(3); int r = random.nextInt(3);
int d = random.nextBoolean() ? 1 : -1; int d = random.nextBoolean() ? 1 : -1;
if (r == 0) x += d; if (r == 0) x += d;