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

secret

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-10-25 20:36:34 -04:00
parent b6cbeac459
commit 4260b1169c
20 changed files with 302 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
kfc/src/main/java/nmd/primal/forgecraft/CommonEvents.java
View File

@@ -1,35 +1,17 @@
package nmd.primal.forgecraft;
import net.minecraft.init.Items;
import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
import net.minecraftforge.items.ItemStackHandler;
import net.minecraftforge.oredict.OreDictionary;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.api.events.CauldronEvent;
import nmd.primal.core.api.events.CauldronRecipeEvent;
import nmd.primal.core.common.helper.PlayerHelper;
import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.core.common.recipes.tile.CauldronRecipe;
import nmd.primal.core.common.tiles.machines.TileCauldron;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.items.parts.ToolPart;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import nmd.primal.forgecraft.items.tools.CustomAxe;
import nmd.primal.forgecraft.items.tools.CustomHoe;
import nmd.primal.forgecraft.items.tools.CustomPickaxe;
import nmd.primal.forgecraft.items.tools.CustomShovel;
import nmd.primal.forgecraft.util.ToolNBT;
import nmd.primal.forgecraft.util.WeaponNBT;
import java.util.List;
/**
* Created by mminaie on 3/15/17.
*/
@@ -45,7 +27,15 @@ public class CommonEvents implements WeaponNBT {
"forgecraft:cauldron_item.rawwroughtirongladiussmite", "forgecraft:cauldron_item.rawwroughtirongladiusbane", "forgecraft:cauldron_item.rawwroughtirongladiusfire", "forgecraft:cauldron_item.rawwroughtirongladiusfortune",
"forgecraft:cauldron_item.rawclearnirongladiussmite", "forgecraft:cauldron_item.rawclearnirongladiusbane", "forgecraft:cauldron_item.rawclearnirongladiusfire", "forgecraft:cauldron_item.rawclearnirongladiusfortune",
"forgecraft:cauldron_item.rawsteelgladiussmite", "forgecraft:cauldron_item.rawsteelgladiusbane", "forgecraft:cauldron_item.rawsteelgladiusfire", "forgecraft:cauldron_item.rawsteelgladiusfortune",
"forgecraft:cauldron_item.rawwootzgladiussmite", "forgecraft:cauldron_item.rawwootzgladiusbane", "forgecraft:cauldron_item.rawwootzgladiusfire", "forgecraft:cauldron_item.rawwootzgladiusfortune")){
"forgecraft:cauldron_item.rawwootzgladiussmite", "forgecraft:cauldron_item.rawwootzgladiusbane", "forgecraft:cauldron_item.rawwootzgladiusfire", "forgecraft:cauldron_item.rawwootzgladiusfortune",
"forgecraft:cauldron_item.rawcleanironlongswordsmite", "forgecraft:cauldron_item.rawcleanironlongswordbane", "forgecraft:cauldron_item.rawcleanironlongswordfire", "forgecraft:cauldron_item.rawcleanironlongswordfortune",
"forgecraft:cauldron_item.rawsteellongswordsmite", "forgecraft:cauldron_item.rawsteellongswordbane", "forgecraft:cauldron_item.rawsteellongswordfire", "forgecraft:cauldron_item.rawsteellongswordfortune",
"forgecraft:cauldron_item.rawwootzlongswordsmite", "forgecraft:cauldron_item.rawwootzlongswordbane", "forgecraft:cauldron_item.rawwootzlongswordfire", "forgecraft:cauldron_item.rawwootzlongswordfortune",
"forgecraft:cauldron_item.rawironslayersmite", "forgecraft:cauldron_item.rawironslayerbane", "forgecraft:cauldron_item.rawironslayerfire", "forgecraft:cauldron_item.rawironslayerfortune",
"forgecraft:cauldron_item.rawcleanironslayersmite", "forgecraft:cauldron_item.rawcleanironslayerbane", "forgecraft:cauldron_item.rawcleanironslayerfire", "forgecraft:cauldron_item.rawcleanironslayerfortune",
"forgecraft:cauldron_item.rawsteelslayersmite", "forgecraft:cauldron_item.rawsteelslayerbane", "forgecraft:cauldron_item.rawsteelslayerfire", "forgecraft:cauldron_item.rawsteelslayerfortune",
"forgecraft:cauldron_item.rawwootzslayersmite", "forgecraft:cauldron_item.rawwootzslayerbane", "forgecraft:cauldron_item.rawwootzslayerfire", "forgecraft:cauldron_item.rawwootzslayerfortune"
)){
NonNullList<ItemStack> inputList = NonNullList.<ItemStack>withSize(6, ItemStack.EMPTY);
inputList.set(0, event.getTile().getInputHandler().getStackInSlot(0));
@@ -82,7 +72,6 @@ public class CommonEvents implements WeaponNBT {
setModifiers(outputStack, getModifiers(inputStack) + 1);
}
if (RecipeHelper.isOreName(modStack, "gemLapis")) {
System.out.println("We are doign Gem Lapis Things");
setFortuneLevel(outputStack, getFortuneLevel(inputStack) + 1);
setModifiers(outputStack, getModifiers(inputStack) + 1);
}
@@ -105,73 +94,4 @@ public class CommonEvents implements WeaponNBT {
return modStack;
}
/*@SubscribeEvent(priority= EventPriority.HIGHEST, receiveCanceled=true)
public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) {
if(!event.player.getEntityWorld().isRemote) {
if (event.crafting.getItem() instanceof CustomPickaxe) {
doToolNBT(event);
}
if (event.crafting.getItem() instanceof CustomAxe ) {
doToolNBT(event);
}
if (event.crafting.getItem() instanceof CustomShovel ) {
doToolNBT(event);
}
if (event.crafting.getItem() instanceof CustomHoe) {
doToolNBT(event);
}
if (event.crafting.getItem() instanceof ToolPart) {
for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { // Checks all the slots
if (event.craftMatrix.getStackInSlot(i) != null) { // If there is an item
ItemStack a = event.craftMatrix.getStackInSlot(i); // Gets the item
if (a.getItem() instanceof CustomAxe) {
doQuickNBT(event, i, a);
PlayerHelper.spawnItemOnPlayer(event.player.world, event.player, new ItemStack(PrimalAPI.Items.LACQUER_STICK, 1));
}
if (a.getItem() instanceof CustomPickaxe) {
doQuickNBT(event, i, a);
PlayerHelper.spawnItemOnPlayer(event.player.world, event.player, new ItemStack(PrimalAPI.Items.LACQUER_STICK, 1));
}
if (a.getItem() instanceof CustomShovel) {
doQuickNBT(event, i, a);
PlayerHelper.spawnItemOnPlayer(event.player.world, event.player, new ItemStack(PrimalAPI.Items.LACQUER_STICK, 1));
}
if (a.getItem() instanceof CustomHoe) {
doQuickNBT(event, i, a);
PlayerHelper.spawnItemOnPlayer(event.player.world, event.player, new ItemStack(PrimalAPI.Items.LACQUER_STICK, 1));
}
}
}
}
}
}
private void doQuickNBT(PlayerEvent.ItemCraftedEvent event, Integer i, ItemStack a){
NBTTagCompound tempTag;
tempTag = a.getSubCompound("tags").copy();
event.crafting.getTagCompound().setTag("tags", tempTag);
event.crafting.getItem().updateItemStackNBT(event.crafting.getTagCompound());
Integer tempDamage = event.craftMatrix.getStackInSlot(i).getItemDamage();
event.crafting.setItemDamage(tempDamage);
}
private void doToolNBT(PlayerEvent.ItemCraftedEvent event) {
NBTTagCompound tempTag;
for (int i = 0; i < event.craftMatrix.getSizeInventory(); i++) { // Checks all the slots
if (event.craftMatrix.getStackInSlot(i) != null) { // If there is an item
ItemStack a = event.craftMatrix.getStackInSlot(i); // Gets the item
if (a.getItem() instanceof ToolPart) {
tempTag = a.getSubCompound("tags").copy();
event.crafting.getTagCompound().setTag("tags", tempTag);
event.crafting.getItem().updateItemStackNBT(event.crafting.getTagCompound());
event.crafting.setItemDamage(event.craftMatrix.getStackInSlot(i).getItemDamage());
}
}
}
}*/
}

1
kfc/src/main/java/nmd/primal/forgecraft/blocks/AnvilBase.java
View File

@@ -8,7 +8,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import nmd.primal.forgecraft.blocks.CustomContainerFacing;
import nmd.primal.forgecraft.tiles.TileAnvil;
import nmd.primal.forgecraft.util.AnvilHandler;

44
kfc/src/main/java/nmd/primal/forgecraft/blocks/machine/Workbench.java
View File

@@ -12,12 +12,10 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import nmd.primal.core.common.helper.PlayerHelper;
import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.core.common.items.tools.Gallagher;
import nmd.primal.core.common.items.tools.WorkBlade;
import nmd.primal.forgecraft.blocks.CustomContainerFacing;
import nmd.primal.forgecraft.crafting.WorkbenchCrafting;
import nmd.primal.forgecraft.items.parts.ToolPart;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import nmd.primal.forgecraft.tiles.TileWorkbench;
import javax.annotation.Nullable;
@@ -61,14 +59,6 @@ public class Workbench extends CustomContainerFacing {
tempStack.setCount(1);
tile.setSlotStack(6, tempStack);
player.inventory.setInventorySlotContents(player.inventory.currentItem, ItemStack.EMPTY);
System.out.println(tile.getSlotStack(0));
System.out.println(tile.getSlotStack(1));
System.out.println(tile.getSlotStack(2));
System.out.println(tile.getSlotStack(3));
System.out.println(tile.getSlotStack(4));
System.out.println(tile.getSlotStack(5));
System.out.println(tile.getSlotStack(6));
return true;
}
}
@@ -107,10 +97,10 @@ public class Workbench extends CustomContainerFacing {
}
}
}
if(playerStack.getItem() instanceof Gallagher) {
if (!slot2.isEmpty() && !slot3.isEmpty() && !slot4.isEmpty() && slot5.isEmpty()) {
if(player.inventory.getCurrentItem().getItem() instanceof Gallagher || player.inventory.getCurrentItem().getItem() instanceof WorkBlade) {
if (slot5.isEmpty()) {
WorkbenchCrafting recipe = WorkbenchCrafting.getRecipe(slot2, slot3, slot4, slot5);
WorkbenchCrafting recipe = WorkbenchCrafting.getRecipe(slot2, slot3, slot4, slot5, player.inventory.getCurrentItem());
if (recipe != null) {
ItemStack drops = recipe.getOutput();
if (slot3.hasTagCompound()) {
@@ -126,7 +116,7 @@ public class Workbench extends CustomContainerFacing {
}
}
if (slot2.isEmpty() && slot3.isEmpty() && slot4.isEmpty() && !slot5.isEmpty()) {
WorkbenchCrafting recipe = WorkbenchCrafting.getRecipe(slot2, slot3, slot4, slot5);
WorkbenchCrafting recipe = WorkbenchCrafting.getRecipe(slot2, slot3, slot4, slot5, player.inventory.getCurrentItem());
if (recipe != null) {
ItemStack drops = recipe.getOutput();
if (slot5.hasTagCompound()) {
@@ -143,8 +133,14 @@ public class Workbench extends CustomContainerFacing {
}
}
}
}
if(player.isSneaking()){
if(player.isSneaking() && player.inventory.getCurrentItem().isEmpty()){
if(!slot6.isEmpty()){
PlayerHelper.spawnItemOnGround(world, pos, tile.getSlotStack(6));
tile.clearSlot(6);
return true;
}
if(!slot2.isEmpty()){
PlayerHelper.spawnItemOnPlayer(world, player, tile.getSlotStack(2));
tile.clearSlot(2);
@@ -165,20 +161,6 @@ public class Workbench extends CustomContainerFacing {
tile.clearSlot(5);
return true;
}
if(!slot6.isEmpty()){
System.out.println(tile.getSlotStack(0));
System.out.println(tile.getSlotStack(1));
System.out.println(tile.getSlotStack(2));
System.out.println(tile.getSlotStack(3));
System.out.println(tile.getSlotStack(4));
System.out.println(tile.getSlotStack(5));
System.out.println(tile.getSlotStack(6));
PlayerHelper.spawnItemOnPlayer(world, player, tile.getSlotStack(6));
tile.clearSlot(6);
return true;
}
}
}
@@ -227,7 +209,7 @@ public class Workbench extends CustomContainerFacing {
}
}
}
return true;
return false;
}
private boolean sideInventoryManager(World world, EntityPlayer player, TileWorkbench tile, ItemStack slot, int index)

12
kfc/src/main/java/nmd/primal/forgecraft/compat/jei/workbench/WorkbenchRecipeCategory.java
View File

@@ -8,9 +8,7 @@ import mezz.jei.api.ingredients.IIngredients;
import net.minecraft.client.Minecraft;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.core.common.helper.CommonUtils;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.compat.jei.AbstractCategory;
@@ -90,16 +88,12 @@ public class WorkbenchRecipeCategory extends AbstractCategory<WorkbenchRecipeWra
items.set(4, recipe.output);
/***EXTRAS***/
items.init(5, false, 66, 20);
items.init(5, true, 66, 20);
ItemStack bench = new ItemStack(Item.getItemFromBlock(ModBlocks.workbench), 1);
items.set(5, bench);
items.init(6, false, 66, 1);
NonNullList<ItemStack> tempDrops = NonNullList.<ItemStack>create();
tempDrops.add(0, new ItemStack(PrimalAPI.Items.STONE_GALLAGHER, 1));
tempDrops.add(1, new ItemStack(PrimalAPI.Items.NETHER_GALLAGHER, 1));
tempDrops.add(2, new ItemStack(PrimalAPI.Items.IRON_GALLAGHER, 1));
tempDrops.add(3, new ItemStack(PrimalAPI.Items.QUARTZ_GALLAGHER, 1));
items.set(6, tempDrops);
List<ItemStack> tool = Arrays.asList( recipe.tool.getMatchingStacks());
items.set(6, tool);
}
}

3
kfc/src/main/java/nmd/primal/forgecraft/compat/jei/workbench/WorkbenchRecipeWrapper.java
View File

@@ -20,6 +20,7 @@ public class WorkbenchRecipeWrapper implements IRecipeWrapper {
protected Ingredient toolHead;
protected Ingredient toolPin;
protected Ingredient takeApart;
protected Ingredient tool;
protected ItemStack output;
public WorkbenchRecipeWrapper(WorkbenchCrafting recipe) {
@@ -29,6 +30,7 @@ public class WorkbenchRecipeWrapper implements IRecipeWrapper {
this.toolHead = recipe.getToolHead();
this.toolPin = recipe.getToolPin();
this.takeApart = recipe.getTakeApart();
this.tool = recipe.getCraftingTool();
this.output = recipe.getOutput();
}
@@ -40,6 +42,7 @@ public class WorkbenchRecipeWrapper implements IRecipeWrapper {
ingredients.setInput(ItemStack.class, this.toolHead);
ingredients.setInput(ItemStack.class, this.toolPin);
ingredients.setInput(ItemStack.class, this.takeApart);
ingredients.setInput(ItemStack.class, this.tool);
ingredients.setOutput(ItemStack.class, this.output);
}

25
kfc/src/main/java/nmd/primal/forgecraft/crafting/WorkbenchCrafting.java
View File

@@ -36,6 +36,7 @@ public class WorkbenchCrafting extends AbstractRecipe<WorkbenchCrafting> { //ext
private Ingredient toolPin;
private Ingredient takeApart;
private ItemStack output;
private Ingredient craftingTool;
public Ingredient getTakeApart() {
return takeApart;
@@ -85,15 +86,21 @@ public class WorkbenchCrafting extends AbstractRecipe<WorkbenchCrafting> { //ext
this.ingredientList = ingredientList;
}
public Ingredient getCraftingTool() {
return craftingTool;
}
private List<Ingredient> ingredientList = new ArrayList<>();
public WorkbenchCrafting(Ingredient i0, Ingredient i1, Ingredient i2, Ingredient i3 , ItemStack output){
public WorkbenchCrafting(Ingredient i0, Ingredient i1, Ingredient i2, Ingredient i3 , Ingredient craftingTool, ItemStack output){
super();
this.toolPart = i0;
this.toolHead = i1;
this.toolPin = i2;
this.takeApart = i3;
this.output = output;
this.craftingTool = craftingTool;
}
public static boolean compare(Ingredient ingredient, ItemStack stack){
@@ -116,7 +123,7 @@ public class WorkbenchCrafting extends AbstractRecipe<WorkbenchCrafting> { //ext
return false;
}
public static boolean isRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3){
public static boolean isRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack cTool){
for(WorkbenchCrafting recipe : RECIPES){
if(i0 == null){
i0 = ItemStack.EMPTY;
@@ -130,17 +137,21 @@ public class WorkbenchCrafting extends AbstractRecipe<WorkbenchCrafting> { //ext
if(i3 == null){
i3 = ItemStack.EMPTY;
}
if(cTool == null){
cTool = ItemStack.EMPTY;
}
if(compare(recipe.toolPart, i0) &&
compare(recipe.toolHead, i1) &&
compare(recipe.toolPin, i2) &&
compare(recipe.takeApart, i3) ){
compare(recipe.takeApart, i3) &&
compare(recipe.craftingTool, cTool)){
return true;
}
}
return false;
}
public static WorkbenchCrafting getRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3){
public static WorkbenchCrafting getRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack cTool){
for(WorkbenchCrafting recipe : RECIPES){
if(i0 == null){
@@ -155,8 +166,10 @@ public class WorkbenchCrafting extends AbstractRecipe<WorkbenchCrafting> { //ext
if(i3 == null){
i3 = ItemStack.EMPTY;
}
if(recipe.toolPart.apply(i0) && recipe.toolHead.apply(i1) && recipe.toolPin.apply(i2) && recipe.takeApart.apply(i3) ){
if(cTool == null){
cTool = ItemStack.EMPTY;
}
if(recipe.toolPart.apply(i0) && recipe.toolHead.apply(i1) && recipe.toolPin.apply(i2) && recipe.takeApart.apply(i3) && recipe.craftingTool.apply(cTool) ){
return recipe;
}
}

150
kfc/src/main/java/nmd/primal/forgecraft/crafting/registery/RecipesWorkbench.java
View File

@@ -14,8 +14,6 @@ import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.crafting.WorkbenchCrafting;
import nmd.primal.forgecraft.init.ModItems;
import java.lang.reflect.WildcardType;
@GameRegistry.ObjectHolder(ModInfo.MOD_ID)
@Mod.EventBusSubscriber
public final class RecipesWorkbench {
@@ -31,6 +29,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.copperaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperaxe, 1)).setRecipeName("copperaxe"));
recipes.register (new WorkbenchCrafting(
@@ -38,6 +37,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.copperaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperaxehead, 1)).setRecipeName("copperaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -45,6 +45,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.copperhoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperhoe, 1)).setRecipeName("copperhoe"));
recipes.register (new WorkbenchCrafting(
@@ -52,6 +53,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.copperhoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperhoehead, 1)).setRecipeName("copperhoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -59,6 +61,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.copperpickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperpickaxe, 1)).setRecipeName("copperpickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -66,6 +69,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.copperpickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.copperpickaxehead, 1)).setRecipeName("copperpickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -73,6 +77,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.coppershovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.coppershovel, 1)).setRecipeName("coppershovel"));
recipes.register (new WorkbenchCrafting(
@@ -80,6 +85,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.coppershovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.coppershovelhead, 1)).setRecipeName("coppershovelsplit"));
/***BRONZE***/
@@ -89,6 +95,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.bronzeaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzeaxe, 1)).setRecipeName("bronzeaxe"));
recipes.register (new WorkbenchCrafting(
@@ -96,6 +103,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.bronzeaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzeaxehead, 1)).setRecipeName("bronzeaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -103,6 +111,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.bronzehoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzehoe, 1)).setRecipeName("bronzehoe"));
recipes.register (new WorkbenchCrafting(
@@ -110,6 +119,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.bronzehoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzehoehead, 1)).setRecipeName("bronzehoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -117,6 +127,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.bronzepickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzepickaxe, 1)).setRecipeName("bronzepickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -124,6 +135,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.bronzepickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzepickaxehead, 1)).setRecipeName("bronzepickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -131,6 +143,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.bronzeshovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzeshovel, 1)).setRecipeName("bronzeshovel"));
recipes.register (new WorkbenchCrafting(
@@ -138,6 +151,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.bronzeshovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.bronzeshovelhead, 1)).setRecipeName("bronzeshovelsplit"));
@@ -148,6 +162,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.ironaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironaxe, 1)).setRecipeName("ironaxe"));
recipes.register (new WorkbenchCrafting(
@@ -155,6 +170,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.ironaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironaxehead, 1)).setRecipeName("ironaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -162,6 +178,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.ironhoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironhoe, 1)).setRecipeName("ironhoe"));
recipes.register (new WorkbenchCrafting(
@@ -169,6 +186,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.ironhoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironhoehead, 1)).setRecipeName("ironhoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -176,6 +194,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.pickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironpickaxe, 1)).setRecipeName("ironpickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -183,6 +202,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.ironpickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.pickaxehead, 1)).setRecipeName("ironpickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -190,6 +210,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.ironshovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironshovel, 1)).setRecipeName("ironshovel"));
recipes.register (new WorkbenchCrafting(
@@ -197,6 +218,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.ironshovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.ironshovelhead, 1)).setRecipeName("ironshovelsplit"));
@@ -207,6 +229,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.cleanironaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironaxe, 1)).setRecipeName("cleanironaxe"));
recipes.register (new WorkbenchCrafting(
@@ -214,6 +237,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.cleanironaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironaxehead, 1)).setRecipeName("cleanironaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -221,6 +245,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.cleanironhoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironhoe, 1)).setRecipeName("cleanironhoe"));
recipes.register (new WorkbenchCrafting(
@@ -228,6 +253,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.cleanironhoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironhoehead, 1)).setRecipeName("cleanironhoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -235,6 +261,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.cleanironpickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironpickaxe, 1)).setRecipeName("cleanironpickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -242,6 +269,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.cleanironpickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironpickaxehead, 1)).setRecipeName("cleanironpickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -249,6 +277,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.cleanironshovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironshovel, 1)).setRecipeName("cleanironshovel"));
recipes.register (new WorkbenchCrafting(
@@ -256,6 +285,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.cleanironshovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.cleanironshovelhead, 1)).setRecipeName("cleanironshovelsplit"));
@@ -266,6 +296,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.steelaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelaxe, 1)).setRecipeName("steelaxe"));
recipes.register (new WorkbenchCrafting(
@@ -273,6 +304,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.steelaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelaxehead, 1)).setRecipeName("steelaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -280,6 +312,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.steelhoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelhoe, 1)).setRecipeName("steelhoe"));
recipes.register (new WorkbenchCrafting(
@@ -287,6 +320,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.steelhoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelhoehead, 1)).setRecipeName("steelhoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -294,6 +328,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.steelpickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelpickaxe, 1)).setRecipeName("steelpickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -301,6 +336,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.steelpickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelpickaxehead, 1)).setRecipeName("steelpickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -308,6 +344,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.steelshovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelshovel, 1)).setRecipeName("steelshovel"));
recipes.register (new WorkbenchCrafting(
@@ -315,6 +352,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.steelshovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.steelshovelhead, 1)).setRecipeName("steelshovelsplit"));
@@ -325,6 +363,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.wootzaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzaxe, 1)).setRecipeName("wootzaxe"));
recipes.register (new WorkbenchCrafting(
@@ -332,6 +371,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.wootzaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzaxehead, 1)).setRecipeName("wootzaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -339,6 +379,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.wootzhoehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzhoe, 1)).setRecipeName("wootzhoe"));
recipes.register (new WorkbenchCrafting(
@@ -346,6 +387,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.wootzhoe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzhoehead, 1)).setRecipeName("wootzhoesplit"));
recipes.register (new WorkbenchCrafting(
@@ -353,6 +395,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.wootzpickaxehead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzpickaxe, 1)).setRecipeName("wootzpickaxe"));
recipes.register (new WorkbenchCrafting(
@@ -360,6 +403,7 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.wootzpickaxe, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzpickaxehead, 1)).setRecipeName("wootzpickaxesplit"));
recipes.register (new WorkbenchCrafting(
@@ -367,6 +411,7 @@ public final class RecipesWorkbench {
Ingredient.fromStacks(new ItemStack(ModItems.wootzshovelhead, 1)),
new OreIngredient("pinBasic"),
Ingredient.EMPTY,
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzshovel, 1)).setRecipeName("wootzshovel"));
recipes.register (new WorkbenchCrafting(
@@ -374,16 +419,117 @@ public final class RecipesWorkbench {
Ingredient.EMPTY,
Ingredient.EMPTY,
Ingredient.fromStacks(new ItemStack(ModItems.wootzshovel, 1, OreDictionary.WILDCARD_VALUE)),
new OreIngredient("toolGallagher"),
new ItemStack(ModItems.wootzshovelhead, 1)).setRecipeName("wootzshovelsplit"));
/*********WEAPONS********/
/***GLADIUS***/
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawcoppergladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.coppergladius, 1)).setRecipeName("coppergladius"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawbronzegladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.bronzegladius, 1)).setRecipeName("bronzegladius"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawwroughtirongladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.wroughtirongladius, 1)).setRecipeName("wroughtirongladius"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawcleanirongladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.cleanirongladius, 1)).setRecipeName("cleanirongladius"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawsteelgladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.steelgladius, 1)).setRecipeName("steelgladius"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawwootzgladius, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.wootzgladius, 1)).setRecipeName("wootzgladius"));
/***LONGSWORD***/
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawcleanironlongsword, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.cleanironlongsword, 1)).setRecipeName("cleanironlongsword"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawsteellongsword, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.steellongsword, 1)).setRecipeName("steellongsword"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawwootzlongsword, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.wootzlongsword, 1)).setRecipeName("wootzlongsword"));
/***SLAYER***/
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawironslayer, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.wroughtironslayer, 1)).setRecipeName("ironslayer"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawcleanironslayer, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.cleanironslayer, 1)).setRecipeName("cleanironslayer"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawsteelslayer, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.steelslayer, 1)).setRecipeName("steelslayer"));
recipes.register (new WorkbenchCrafting(
new OreIngredient("cordageGeneral"),
Ingredient.fromStacks(new ItemStack(ModItems.rawwootzslayer, 1)),
Ingredient.EMPTY,
Ingredient.EMPTY,
new OreIngredient("toolWorkBlade"),
new ItemStack(ModItems.wootzslayer, 1)).setRecipeName("wootzslayer"));
}
}

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

@@ -11,10 +11,10 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.blocks.Chisel;
import nmd.primal.forgecraft.blocks.YewStave;
import nmd.primal.forgecraft.blocks.AnvilStone;
import nmd.primal.forgecraft.blocks.Chisel;
import nmd.primal.forgecraft.blocks.NBTCrucible;
import nmd.primal.forgecraft.blocks.YewStave;
import nmd.primal.forgecraft.blocks.machine.*;
/**

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

@@ -410,7 +410,7 @@ public class ModCrafting{
muddd,muddd,empty,muddd,muddd,
muddd,empty,empty,empty,muddd,
muddd,muddd,empty,muddd,muddd },
new ItemStack(ModItems.bronzegladius, 1)
new ItemStack(ModItems.rawbronzegladius, 1)
);
//Casting Bronze Plate
@@ -472,7 +472,7 @@ public class ModCrafting{
muddd, muddd, muddd, muddd, muddd},
copperhoehead
);
/*
//Casting Gladius
CastingCrafting.addRecipe(
new ItemStack(PrimalAPI.Items.COPPER_INGOT, 1),
@@ -482,9 +482,8 @@ public class ModCrafting{
muddd,muddd,empty,muddd,muddd,
muddd,empty,empty,empty,muddd,
muddd,muddd,empty,muddd,muddd },
new ItemStack(ModItems.coppergladius, 1)
new ItemStack(ModItems.rawcoppergladius, 1)
);
*/
//Casting Bronze Plate
CastingCrafting.addRecipe(
@@ -1065,7 +1064,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotChunk,emptyAir,emptyAir,
emptyAir,hotChunk,hotChunk,hotChunk,emptyAir,
emptyAir,emptyAir,hotChunk,emptyAir,emptyAir },
new ItemStack(ModItems.wroughtirongladius, 1),
new ItemStack(ModItems.rawwroughtirongladius, 1),
"null"
);
/*** Temp Clean Iron Sword ***/
@@ -1077,7 +1076,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir,
emptyAir,hotCleanChunk,hotCleanChunk,hotCleanChunk,emptyAir,
emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir },
new ItemStack(ModItems.cleanirongladius, 1),
new ItemStack(ModItems.rawcleanirongladius, 1),
"null"
);
/*** Temp Steel Sword ***/
@@ -1088,7 +1087,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir,
emptyAir,hotSteelChunk,hotSteelChunk,hotSteelChunk,emptyAir,
emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir },
new ItemStack(ModItems.steelgladius, 1),
new ItemStack(ModItems.rawsteelgladius, 1),
"null"
);
/*** Temp Wootz Sword ***/
@@ -1099,7 +1098,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir,
emptyAir,hotWootzChunk,hotWootzChunk,hotWootzChunk,emptyAir,
emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir },
new ItemStack(ModItems.wootzgladius, 1),
new ItemStack(ModItems.rawwootzgladius, 1),
"null"
);
/*** Temp Clean Iron LongSword ***/
@@ -1110,7 +1109,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir,
emptyAir,hotCleanChunk,hotCleanChunk,hotCleanChunk,emptyAir,
emptyAir,emptyAir,hotCleanChunk,emptyAir,emptyAir },
new ItemStack(ModItems.cleanironlongsword, 1),
new ItemStack(ModItems.rawcleanironlongsword, 1),
"null"
);
/*** Temp Steel LongSword ***/
@@ -1121,7 +1120,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir,
emptyAir,hotSteelChunk,hotSteelChunk,hotSteelChunk,emptyAir,
emptyAir,emptyAir,hotSteelChunk,emptyAir,emptyAir },
new ItemStack(ModItems.steellongsword, 1),
new ItemStack(ModItems.rawsteellongsword, 1),
"null"
);
/*** Temp Wootz LongSword ***/
@@ -1132,7 +1131,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir,
emptyAir,hotWootzChunk,hotWootzChunk,hotWootzChunk,emptyAir,
emptyAir,emptyAir,hotWootzChunk,emptyAir,emptyAir },
new ItemStack(ModItems.wootzlongsword, 1),
new ItemStack(ModItems.rawwootzlongsword, 1),
"null"
);
@@ -1144,7 +1143,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotChunk,hotChunk,emptyAir,
emptyAir,hotChunk,hotChunk,hotChunk,hotChunk,
emptyAir,emptyAir,hotChunk,hotChunk,emptyAir },
new ItemStack(ModItems.wroughtironslayer, 1),
new ItemStack(ModItems.rawironslayer, 1),
"null"
);
/*** Temp CLEANIRON SLAYER ***/
@@ -1155,7 +1154,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotCleanChunk,hotCleanChunk,emptyAir,
emptyAir,hotCleanChunk,hotCleanChunk,hotCleanChunk,hotCleanChunk,
emptyAir,emptyAir,hotCleanChunk,hotCleanChunk,emptyAir },
new ItemStack(ModItems.cleanironslayer, 1),
new ItemStack(ModItems.rawcleanironslayer, 1),
"null"
);
/*** Temp STEELSLAYER ***/
@@ -1166,7 +1165,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotSteelChunk,hotSteelChunk,emptyAir,
emptyAir,hotSteelChunk,hotSteelChunk,hotSteelChunk,hotSteelChunk,
emptyAir,emptyAir,hotSteelChunk,hotSteelChunk,emptyAir },
new ItemStack(ModItems.steelslayer, 1),
new ItemStack(ModItems.rawsteelslayer, 1),
"null"
);
/*** Temp WOOTZ SLAYER ***/
@@ -1177,7 +1176,7 @@ public class ModCrafting{
emptyAir,emptyAir,hotWootzChunk,hotWootzChunk,emptyAir,
emptyAir,hotWootzChunk,hotWootzChunk,hotWootzChunk,hotWootzChunk,
emptyAir,emptyAir,hotWootzChunk,hotWootzChunk,emptyAir },
new ItemStack(ModItems.wootzslayer, 1),
new ItemStack(ModItems.rawwootzslayer, 1),
"null"
);

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

@@ -1,7 +1,7 @@
package nmd.primal.forgecraft.init;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraft.init.Items;
import net.minecraftforge.oredict.OreDictionary;
import static nmd.primal.forgecraft.init.ModConfig.Compatibility.COMPAT_DICTIONARY_WROUGHT_IRON;

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

@@ -43,11 +43,11 @@ public class ModFluids {
{
final IForgeRegistry<Block> registry = event.getRegistry();
registerFluidBlock(registry,
/*registerFluidBlock(registry,
HOLY_WATER = createFluid("holy_water", 0xFFEDF1F5, true,
fluid -> fluid.setDensity(1000).setViscosity(1000).setTemperature(100).setLuminosity(5).setGaseous(false),
fluid -> new BasicFluidBlockKFC(fluid, Material.WATER)));
*/
}
/**

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

@@ -13,8 +13,6 @@ import nmd.primal.forgecraft.items.*;
import nmd.primal.forgecraft.items.armor.CustomHelmet;
import nmd.primal.forgecraft.items.blocks.ItemNBTCrucible;
import nmd.primal.forgecraft.items.parts.ToolPart;
import nmd.primal.forgecraft.items.parts.WeaponGuard;
import nmd.primal.forgecraft.items.parts.WeaponHandle;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import nmd.primal.forgecraft.items.tools.CustomAxe;
import nmd.primal.forgecraft.items.tools.CustomHoe;
@@ -457,6 +455,7 @@ public class ModItems {
ForgeRegistries.ITEMS.register(rawsteelslayer);
ForgeRegistries.ITEMS.register(rawwootzslayer);
ForgeRegistries.ITEMS.register(coppergladius);
ForgeRegistries.ITEMS.register(wroughtirongladius);
ForgeRegistries.ITEMS.register(bronzegladius);
ForgeRegistries.ITEMS.register(cleanirongladius);
@@ -615,6 +614,7 @@ public class ModItems {
WEAPONS
**********/
registerRender(coppergladius);
registerRender(bronzegladius);
registerRender(wroughtirongladius);
registerRender(cleanirongladius);

25
kfc/src/main/java/nmd/primal/forgecraft/init/recipes/CauldronRecipes.java
View File

@@ -1,8 +1,6 @@
package nmd.primal.forgecraft.init.recipes;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
@@ -15,7 +13,6 @@ import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.core.common.recipes.tile.CauldronRecipe;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.util.WeaponNBT;
import java.util.List;
@@ -35,14 +32,22 @@ public class CauldronRecipes
ItemStack defaultSteelGladius = new ItemStack(ModItems.rawsteelgladius, 1);
ItemStack defaultWootzGladius = new ItemStack(ModItems.rawwootzgladius, 1);
setDefaultNBT(defaultBronzeGladius);
setDefaultNBT(defaultCopperGladius);
setDefaultNBT(defaultWroughtIronGladius);
setDefaultNBT(defaultCleanIronGladius);
setDefaultNBT(defaultSteelGladius);
setDefaultNBT(defaultWootzGladius);
ItemStack defaultCleanIronLongsword = new ItemStack(ModItems.rawcleanironlongsword, 1);
ItemStack defaultSteelLongsword = new ItemStack(ModItems.rawsteellongsword, 1);
ItemStack defaultWootzLongsword = new ItemStack(ModItems.rawwootzlongsword, 1);
List<ItemStack> recipeList = RecipeHelper.buildList(defaultBronzeGladius, defaultCopperGladius, defaultWroughtIronGladius, defaultCleanIronGladius, defaultSteelGladius, defaultWootzGladius);
ItemStack defaultIronSlayer = new ItemStack(ModItems.rawironslayer, 1);
ItemStack defaultCleanIronSlayer = new ItemStack(ModItems.rawcleanironslayer, 1);
ItemStack defaultSteelSlayer = new ItemStack(ModItems.rawsteelslayer, 1);
ItemStack defaultWootzSlayer = new ItemStack(ModItems.rawwootzslayer, 1);
List<ItemStack> recipeList = RecipeHelper.buildList(defaultBronzeGladius, defaultCopperGladius, defaultWroughtIronGladius, defaultCleanIronGladius, defaultSteelGladius, defaultWootzGladius,
defaultCleanIronLongsword, defaultSteelLongsword, defaultWootzLongsword,
defaultIronSlayer, defaultCleanIronSlayer, defaultSteelSlayer, defaultWootzSlayer);
for(ItemStack s : recipeList){
setDefaultNBT(s);
}
genRecipesForList(recipeList, recipes);

11
kfc/src/main/java/nmd/primal/forgecraft/items/parts/WeaponPart.java
View File

@@ -1,29 +1,18 @@
package nmd.primal.forgecraft.items.parts;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.block.Block;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.util.ToolMaterialMap;
import nmd.primal.forgecraft.util.ToolNBT;
import nmd.primal.forgecraft.util.WeaponNBT;
import javax.annotation.Nullable;

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

@@ -9,7 +9,6 @@ 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.world.World;

19
kfc/src/main/java/nmd/primal/forgecraft/items/weapons/Longbow.java
View File

@@ -1,33 +1,28 @@
package nmd.primal.forgecraft.items.weapons;
import com.google.common.collect.ImmutableMap;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.init.Enchantments;
import net.minecraft.init.Items;
import net.minecraft.item.*;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.ItemArrow;
import net.minecraft.item.ItemBow;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.util.*;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.world.World;
import net.minecraftforge.common.animation.ITimeValue;
import net.minecraftforge.common.animation.TimeValues;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.model.animation.CapabilityAnimation;
import net.minecraftforge.common.model.animation.IAnimationStateMachine;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import nmd.primal.forgecraft.ModInfo;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.init.ModSounds;
import nmd.primal.forgecraft.items.BaseItem;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;

45
kfc/src/main/java/nmd/primal/forgecraft/renders/blocks/TileWorkbenchRender.java
View File

@@ -13,8 +13,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.forgecraft.blocks.machine.Workbench;
import nmd.primal.forgecraft.items.parts.WeaponGuard;
import nmd.primal.forgecraft.items.parts.WeaponHandle;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import nmd.primal.forgecraft.tiles.TileWorkbench;
import org.lwjgl.opengl.GL11;
@@ -146,6 +144,17 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
GL11.glPopMatrix();
}
if(!stack6.isEmpty()){
GL11.glPushMatrix();
//System.out.println(stack2);
GL11.glTranslated(0.09375D, 0.6D, 0.53125D);
GL11.glRotated(-45.0F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.5F, 0.5F, 0.5F);
renderItem.renderItem(stack6, ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
}
if (state.getValue(Workbench.FACING) == EnumFacing.SOUTH) {
@@ -237,6 +246,18 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
GL11.glPopMatrix();
}
if(!stack6.isEmpty()){
GL11.glPushMatrix();
//System.out.println(stack2);
//GL11.glTranslated(0.09375D, 0.6D, 0.53125D);
GL11.glTranslated(1-0.09375D, 0.6D, 1-0.53125D);
GL11.glRotated(-45.0F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.5F, 0.5F, 0.5F);
renderItem.renderItem(stack6, ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
}
if (state.getValue(Workbench.FACING) == EnumFacing.EAST) {
@@ -326,6 +347,17 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
GL11.glPopMatrix();
}
if(!stack6.isEmpty()){
GL11.glPushMatrix();
//System.out.println(stack2);
GL11.glTranslated(1-0.53125D, 0.6D, 0.09375D);
GL11.glRotated(90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotated(-45.0F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.5F, 0.5F, 0.5F);
renderItem.renderItem(stack6, ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
}
if (state.getValue(Workbench.FACING) == EnumFacing.WEST) {
@@ -412,6 +444,15 @@ public class TileWorkbenchRender extends TileEntitySpecialRenderer<TileWorkbench
renderItem.renderItem(stack5, ItemCameraTransforms.TransformType.HEAD);
GL11.glPopMatrix();
}
if(!stack6.isEmpty()){
GL11.glPushMatrix();
GL11.glTranslated(0.53125D, 0.6D, 1-0.09375D);
GL11.glRotated(90.0F, 0.0F, 1.0F, 0.0F);
GL11.glRotated(-45.0F, 0.0F, 0.0F, 1.0F);
GL11.glScalef(0.5F, 0.5F, 0.5F);
renderItem.renderItem(stack6, ItemCameraTransforms.TransformType.FIXED);
GL11.glPopMatrix();
}
}

1
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileWorkbench.java
View File

@@ -5,7 +5,6 @@ import nmd.primal.core.common.helper.RecipeHelper;
import nmd.primal.core.common.items.tools.Gallagher;
import nmd.primal.forgecraft.items.parts.ToolPart;
import nmd.primal.forgecraft.items.parts.WeaponGuard;
import nmd.primal.forgecraft.items.parts.WeaponHandle;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import nmd.primal.forgecraft.items.tools.CustomAxe;
import nmd.primal.forgecraft.items.tools.CustomHoe;

3
kfc/src/main/java/nmd/primal/forgecraft/util/WeaponNBT.java
View File

@@ -1,14 +1,11 @@
package nmd.primal.forgecraft.util;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreIngredient;
import nmd.primal.core.api.PrimalAPI;
import nmd.primal.forgecraft.init.ModItems;
import nmd.primal.forgecraft.items.parts.WeaponPart;
import java.util.Hashtable;

25
kfc/src/main/resources/assets/forgecraft/lang/en_US.lang
View File

@@ -62,17 +62,37 @@ item.cast_shovel.name=Shovel Cast
item.cast_hoe.name=Hoe Cast
item.castingmud.name=Casting Mud
item.rawcoppergladius.name=Raw Copper Gladius
item.rawbronzegladius.name=Raw Bronze Gladius
item.rawwroughtirongladius.name=Raw Wrought Iron Gladius
item.rawcleanirongladius.name=Raw Clean Iron Gladius
item.rawsteelgladius.name=Raw Steel Gladius
item.rawwootzgladius.name=Raw Damascus Gladius
item.rawcleanironlongsword.name=Raw Clean Iron Longsword
item.rawsteellongsword.name=Raw Steel Longsword
item.rawwootzlongsword.name=Raw Damascus Longsword
item.rawtironslayer.name=Raw Wrought Iron Slayer
item.rawcleanironslayer.name=Raw Clean Iron Slayer
item.rawsteelslayer.name=Raw Steel Slayer
item.rawwootzslayer.name=Raw Damascus Slayer
item.coppergladius.name=Copper Gladius
item.bronzegladius.name=Bronze Gladius
item.wroughtirongladius.name=Wrought Iron Gladius
item.cleanirongladius.name=Clean Iron Gladius
item.steelgladius.name=Steel Gladius
item.wootzgladius.name=Damascus Gladius
item.cleanironlongsword.name=Clean Iron Longsword
item.steellongsword.name=Steel Longsword
item.wootzlongsword.name=Damascus Longsword
item.wroughtironslayer.name=Wrought Iron Slayer
item.cleanironslayer.name=Clean Iron Slayer
item.steelslayer.name=Steel Slayer
item.wootzslayer.name=Damascus Slayer
item.bronzepickaxehead.name=Bronze Pickaxe Head
item.bronzeaxehead.name=Bronze Axe Head
@@ -121,9 +141,7 @@ item.wootzpickaxe.name=Damascus Pickaxe
item.wootzaxe.name=Damascus Axe
item.wootzshovel.name=Damascus Shovel
item.wootzhoe.name=Damascus Hoe
item.wootzgladius.name=Damascus Gladius
item.wootzlongsword.name=Damascus Longsword
item.wootzslayer.name=Damascus Slayer
item.copperpickaxehead.name=Copper Pickaxe Head
item.copperaxehead.name=Copper Axe Head
@@ -157,7 +175,6 @@ jei.category.forgecraft.anvil=Anvil Crafting
jei.category.forgecraft.casting=Casting
jei.category.forgecraft.forging=Forging
jei.category.forgecraft.workbench=Tool Bench
jei.category.forgecraft.toolbench=Tool Bench
jei.info.forgecraft.crucible=Crucible Crafting
jei.info.forgecraft.anvil=Anvil Crafting