nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update version, start weapon upgrades

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-09-21 00:04:40 -04:00
parent 7151eef000
commit 6656a2a3ab
9 changed files with 100 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kfc/gradle.properties
View File

@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
mod_group=nmd.primal.forgecraft
mod_name=ForgeCraft
mod_version=1.6.03
mod_version=1.6.04
forge_version=14.23.4.2744
mcp_mappings=snapshot_20171003
mc_version=1.12.2

2
kfc/src/main/java/nmd/primal/forgecraft/ModInfo.java
View File

@@ -21,7 +21,7 @@ public class ModInfo {
//public static final String MOD_PREFIX = MOD_ID + ":";
public static final String MOD_CHANNEL = MOD_ID;
public static final String MOD_VERSION = "1.6.03";
public static final String MOD_VERSION = "1.6.04";
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.6.69,);";

5
kfc/src/main/java/nmd/primal/forgecraft/blocks/CastingForm.java
View File

@@ -85,8 +85,8 @@ public class CastingForm extends CustomContainerFacing implements CastingFormHan
CastingCrafting casting = CastingCrafting.getRecipe(tongsStack, tempArray);
if(casting != null){
NBTTagCompound tagOutput = casting.getOutput().getSubCompound("tag");
NBTTagCompound tagOutput = casting.getOutput().getTagCompound();
//System.out.println(tagOutput);
if(tagOutput != null) {
ItemStack dropStack = casting.getOutput();
dropStack.setTagCompound(new NBTTagCompound());
@@ -123,6 +123,7 @@ public class CastingForm extends CustomContainerFacing implements CastingFormHan
return true;
}
if(tagOutput == null){
System.out.println("Tag is null");
if( !(casting.getOutput().getItem() instanceof BronzeToolPart) ){
ItemStack dropStack = casting.getOutput();
CommonUtils.spawnItemEntityFromWorld(world, pos, dropStack);

5
kfc/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java
View File

@@ -25,8 +25,7 @@ public class ModDictionary {/***************************************************
OreDictionary.registerOre("nuggetIron", ModItems.ironcleanchunk);
OreDictionary.registerOre("ingotSteel", ModItems.steelingotball);
OreDictionary.registerOre("nuggetSteel", ModItems.steelchunk);
OreDictionary.registerOre("ingotBronze", ModItems.bronzeingotball);
OreDictionary.registerOre("nuggetBronze", ModItems.bronzechunk);
}
}

4
kfc/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java
View File

@@ -178,10 +178,6 @@ public class ModCrafting{
for(ItemStack temp : toolArray) {
System.out.println(temp);
if(temp.getTagCompound() == null){
System.out.println("NBT is Null");
}
NBTTagCompound tags = new NBTTagCompound();
temp.getTagCompound().setTag("tags", tags);

7
kfc/src/main/java/nmd/primal/forgecraft/init/ModItems.java
View File

@@ -34,6 +34,7 @@ public class ModItems {
public static Item softcrucible;
//public static Item stonetongs;
public static Item castingmud;
public static Item rawbronzegladius;
public static Item bronzeingotball;
public static Item bronzechunk;
@@ -209,6 +210,8 @@ public class ModItems {
/**********
WEAPONS
**********/
rawbronzegladius = new Item().setRegistryName("rawbronzegladius").setUnlocalizedName("rawbronzegladius");
bronzegladius = new CustomSword("bronzegladius", PrimalAPI.ToolMaterials.TOOL_BRONZE, 5.5D, 2D);
wroughtirongladius = new CustomSword("wroughtirongladius", PrimalAPI.ToolMaterials.TOOL_WROUGHT_IRON, 4.5D, -1.85D);
cleanirongladius = new CustomSword("cleanirongladius", PrimalAPI.ToolMaterials.TOOL_CLEAN_IRON, 5D, -1.85D);
@@ -341,6 +344,8 @@ public class ModItems {
/**********
WEAPONS
**********/
ForgeRegistries.ITEMS.register(rawbronzegladius);
ForgeRegistries.ITEMS.register(wroughtirongladius);
ForgeRegistries.ITEMS.register(bronzegladius);
ForgeRegistries.ITEMS.register(cleanirongladius);
@@ -462,6 +467,8 @@ public class ModItems {
**********/
registerRender(wroughtironshield);
registerRender(rawbronzegladius);
registerRender(bronzegladius);
registerRender(wroughtirongladius);
registerRender(cleanirongladius);

58
kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java Normal file
View File

@@ -0,0 +1,58 @@
package nmd.primal.forgecraft.init.recipes;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.registries.IForgeRegistry;
import nmd.primal.core.common.recipes.tile.CauldronRecipe;
import nmd.primal.core.common.recipes.tile.HibachiRecipe;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModBlocks;
import nmd.primal.forgecraft.init.ModItems;
@GameRegistry.ObjectHolder(ModInfo.MOD_ID)
@Mod.EventBusSubscriber
public class CauldronRecipes
{
@SubscribeEvent
public static void registerCauldronRecipes(RegistryEvent.Register<CauldronRecipe> event)
{
final IForgeRegistry<CauldronRecipe> recipes = event.getRegistry();
ItemStack defaultBronze = new ItemStack(ModItems.bronzegladius);
NBTTagCompound tags = new NBTTagCompound();
defaultBronze.setTagCompound(tags);
ItemStack lapisBronze = defaultBronze.copy();
lapisBronze.getTagCompound().setTag("tags", tags);
lapisBronze.getSubCompound("tags").setInteger("smite", 0);
lapisBronze.getSubCompound("tags").setInteger("bane", 0);
lapisBronze.getSubCompound("tags").setInteger("fire", 0);
lapisBronze.getSubCompound("tags").setInteger("lapis", 1);
lapisBronze.getSubCompound("tags").setBoolean("modified", true);
recipes.register(new CauldronRecipe(
5,
FluidRegistry.getFluidStack("water", 1000),
FluidRegistry.getFluidStack("water", 1000),
new ItemStack(ModItems.rawbronzegladius, 1),
new ItemStack(Items.DYE, 1, 4),
ItemStack.EMPTY,
ItemStack.EMPTY,
lapisBronze,
ItemStack.EMPTY).setRecipeName("finishedGladius")
);
}
}

27
kfc/src/main/java/nmd/primal/forgecraft/items/weapons/CustomSword.java
View File

@@ -2,16 +2,25 @@ package nmd.primal.forgecraft.items.weapons;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.forgecraft.ModInfo;
import javax.annotation.Nullable;
import java.util.List;
/**
* Created by mminaie on 3/23/17.
*/
@@ -49,6 +58,12 @@ public class CustomSword extends ItemSword {
return 0;
}
@Override
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
{
return false;
}
@Override
public Multimap<String, AttributeModifier> getItemAttributeModifiers(EntityEquipmentSlot equipmentSlot)
{
@@ -63,4 +78,16 @@ public class CustomSword extends ItemSword {
return multimap;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack item, @Nullable World world, List<String> tooltip, ITooltipFlag flagIn)
{
//tooltip.add(ChatFormatting.GRAY + "Damage: " + item.getItemDamage() );
if(item.hasTagCompound())
{
tooltip.add(ChatFormatting.GRAY + "Upgrades Left: " );
tooltip.add(ChatFormatting.LIGHT_PURPLE + "Damage: " + item.getItemDamage() );
}
}
}

2
kfc/src/main/resources/mcmod.info
View File

@@ -2,7 +2,7 @@
"modid": "forgecraft",
"name": "Kitsu's Forgecraft",
"description": "Forged with sweat and blood",
"version": "1.6.03",
"version": "1.6.04",
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",