From 4203c42cb4cffd4f9b21d18ffd4a1b469aa366bd Mon Sep 17 00:00:00 2001 From: An Sar Date: Thu, 5 Oct 2017 20:42:12 -0700 Subject: [PATCH] update to primal 0.6.x, version bump, increase forge to 1.12.2 --- kfc/gradle.properties | 10 +++++----- kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java | 4 ++-- .../nmd/primal/forgecraft/blocks/BloomeryBase.java | 2 +- .../main/java/nmd/primal/forgecraft/blocks/Forge.java | 2 +- .../java/nmd/primal/forgecraft/init/ModCrafting.java | 2 +- .../nmd/primal/forgecraft/items/weapons/Musket.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kfc/gradle.properties b/kfc/gradle.properties index a1a333c6..b895233a 100644 --- a/kfc/gradle.properties +++ b/kfc/gradle.properties @@ -5,12 +5,12 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.3.25 -forge_version=14.22.1.2480 +mod_version=1.4.0 +forge_version=14.23.0.2493 mcp_mappings=snapshot_20170624 -mc_version=1.12.1 +mc_version=1.12.2 -primal_version=0.5+ +primal_version=0.6+ jei_version=4.7+ waila_version=1.7.0-B3 -apple_version=2.1+ \ No newline at end of file +apple_version=2.1+ diff --git a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java index 211a5f53..d0ce7fe4 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,9 +17,9 @@ public class ModInfo { public static final String MOD_CONFIG = "primal/" + MOD_ID; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.3.25"; + public static final String MOD_VERSION = "1.4.0"; public static final String MC_VERSIONS = "[1.12.0, 1.13.0)"; - public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.5.11,);"; + public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.0,);"; /** Mod Structures **/ public static final String SERVER_PROXY = "nmd.primal.forgecraft.proxy.ServerProxy"; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java index 691caf08..2bbea5fc 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/BloomeryBase.java @@ -23,7 +23,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.crafting.FireSource; +import nmd.primal.core.common.recipes.FireSource; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.crafting.BloomeryCrafting; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java index 9f16b5e9..14109c3a 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/blocks/Forge.java @@ -25,7 +25,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.crafting.FireSource; +import nmd.primal.core.common.recipes.FireSource; import nmd.primal.core.common.helper.PlayerHelper; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.items.parts.ToolPart; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index d90965a9..3f1cea7c 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -6,7 +6,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import nmd.primal.core.api.PrimalAPI; -import nmd.primal.core.common.crafting.RecipeHandler; +import nmd.primal.core.common.recipes.RecipeHandler; import nmd.primal.core.common.helper.CommonUtils; import nmd.primal.forgecraft.crafting.AnvilCrafting; import nmd.primal.forgecraft.crafting.BloomeryCrafting; diff --git a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java index 803df52d..7e9b0e61 100644 --- a/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java +++ b/kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java @@ -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.EntityMuckBall; +import nmd.primal.core.common.entities.projectiles.EntityMuck; import nmd.primal.forgecraft.ModInfo; import nmd.primal.forgecraft.init.ModSounds; import nmd.primal.forgecraft.items.BaseItem; @@ -51,7 +51,7 @@ 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)); - EntityMuckBall entity = new EntityMuckBall(world, player); + EntityMuck entity = new EntityMuck(world, player); entity.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 7.0F, 0.5F); world.spawnEntity(entity); if (!stack.hasTagCompound()) {