etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated to Forge 2173

This commit is contained in:
Adubbz 2016-12-01 11:51:36 +11:00
parent 1218bfe35a
commit 2ae4127f3c
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -9,6 +9,12 @@
/.settings/
/.classpath
/.project
# OS generated files
*.DS_Store
# IntelliJ project files
*.iml
*.ipr
*.iws

4
build.properties
View File

@ -1,4 +1,4 @@
minecraft_version=1.11
forge_version=13.19.0.2152
forge_version=13.19.0.2173
mod_version=6.0.0
mappings_version=snapshot_nodoc_20161118
mappings_version=snapshot_nodoc_20161130

2
src/main/java/biomesoplenty/client/particle/EntityPixieTrailFX.java
View File

@ -100,7 +100,7 @@ public class EntityPixieTrailFX extends Particle
motionY *= 0.9599999785423279D;
motionZ *= 0.9599999785423279D;
if (isCollided)
if (this.onGround)
{
motionX *= 0.699999988079071D;
motionZ *= 0.699999988079071D;

4
src/main/java/biomesoplenty/common/block/BlockBOPPlant.java
View File

@ -271,7 +271,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
case THORN:
if (!usingShears)
{
player.attackEntityFrom(DamageSource.cactus, 2);
player.attackEntityFrom(DamageSource.CACTUS, 2);
}
break;
@ -452,7 +452,7 @@ public class BlockBOPPlant extends BlockBOPDecoration implements IShearable, IHo
if (inventory.armorInventory.get(0) != ItemStack.EMPTY && inventory.armorInventory.get(1) != ItemStack.EMPTY) {
break;
}
entity.attackEntityFrom(DamageSource.cactus, 1);
entity.attackEntityFrom(DamageSource.CACTUS, 1);
}
break;
default:

2
src/main/java/biomesoplenty/common/init/ModBiomes.java
View File

@ -677,7 +677,7 @@ public class ModBiomes implements BOPBiomes.IBiomeRegistry
{
if (biome.isPresent())
{
BiomeDictionary.registerBiomeType(biome.get(), types);
BiomeDictionary.addTypes(biome.get(), types);
}
}

2
src/main/java/biomesoplenty/core/BiomesOPlenty.java
View File

@ -44,7 +44,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
@Mod(modid = BiomesOPlenty.MOD_ID, version = BiomesOPlenty.MOD_VERSION , name = BiomesOPlenty.MOD_NAME, dependencies = "required-after:forge@[13.19.0.2152,)", guiFactory = BiomesOPlenty.GUI_FACTORY)
@Mod(modid = BiomesOPlenty.MOD_ID, version = BiomesOPlenty.MOD_VERSION , name = BiomesOPlenty.MOD_NAME, dependencies = "required-after:forge@[13.19.0.2173,)", guiFactory = BiomesOPlenty.GUI_FACTORY)
public class BiomesOPlenty
{
public static final String MOD_NAME = "Biomes O' Plenty";