update from master-1.12 #16

Closed
kitsu wants to merge 9 commits from master-1.12 into nbtCrucible
5 changed files with 29 additions and 20 deletions
Showing only changes of commit 8b033972ac - Show all commits

View File

@@ -15,19 +15,22 @@ buildscript {
}
}
repositories {
maven {
name = "jei"
url "http://dvs1.progwml6.com/files/maven"
}
maven {
name = "mobius"
url "http://mobiusstrip.eu/maven"
}
maven {
name = "primal"
url "https://maven.nmd.so"
}
maven {
name = "jei"
url "http://dvs1.progwml6.com/files/maven"
}
maven {
name "CraftTweaker"
url "http://maven.blamejared.com/"
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'java'
compileJava {
@@ -42,23 +45,27 @@ minecraft {
version = "${mc_version}" + "-" + "${forge_version}"
runDir = "run"
mappings = "${mcp_mappings}"
// JEI
//useDepAts = true
useDepAts = true
// Replace
replace "@VERSION@", project.mod_version
}
dependencies {
//compile against the JEI API
deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api"
//runtime "mezz.jei:jei_${mc_version}:${jei_version}"
// PrimalCore
deobfCompile "nmd.primal.core:PrimalCore:${mc_version}-${primal_version}:dev"
//runtime "nmd.primal.core:PrimalCore:${primal_version}"
// JEI
//runtime "mezz.jei:jei_${mc_version}:${jei_version}"
deobfCompile "mezz.jei:jei_${mc_version}:${jei_version}:api"
// CraftTweaker
//compile "CraftTweaker2:CraftTweaker2-MC1120-Main:${craftweaker_version}"
compile "CraftTweaker2:CraftTweaker2-API:${craftweaker_version}"
}
processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", "${mod_version}"

View File

@@ -13,3 +13,4 @@ mc_version=1.12.2
primal_version=0.6+
jei_version=4.8+
craftweaker_version=4.0.9.289

View File

@@ -127,7 +127,7 @@ public class BloomeryBase extends CustomContainerFacing implements ITileEntityPr
}
if(tile.getSlotStack(0) != ItemStack.EMPTY) {
if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) {
if((FireSource.useSource(world, pos, facing, player, hand, pItem, hitX, hitY, hitZ))) {
world.setBlockState(pos, state.withProperty(PrimalAPI.States.ACTIVE, true), 2);
tile.setHeat(100);
tile.markDirty();

View File

@@ -118,7 +118,7 @@ public class Forge extends CustomContainerFacing implements ITileEntityProvider{
}
}
}
if((FireSource.useSource(world, pos, player, pItem, hand, facing, hitX, hitY, hitZ))) {
if((FireSource.useSource(world, pos, facing, player, hand, pItem, hitX, hitY, hitZ))) {
world.setBlockState(pos, state.withProperty(PrimalAPI.States.ACTIVE, true), 2);
tile.setHeat(100);
tile.markDirty();

View File

@@ -10,7 +10,7 @@ import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.common.entities.projectiles.EntityMuck;
import nmd.primal.core.common.entities.projectiles.EntityMud;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModSounds;
import nmd.primal.forgecraft.items.BaseItem;
@@ -51,7 +51,8 @@ public class Musket extends BaseItem{
//if(player.getItemInUseCount() > 5) {
world.playSound( null, player.posX, player.posY, player.posZ, ModSounds.MUSKET_SHOT, SoundCategory.BLOCKS, 0.5F, 0.3F / (itemRand.nextFloat() * 0.4F + 0.8F));
EntityMuck entity = new EntityMuck(world, player);
EntityMud entity = new EntityMud(world, player);
entity.setType("muck");
entity.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 7.0F, 0.5F);
world.spawnEntity(entity);
if (!stack.hasTagCompound()) {