fixing forge
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
## Bugs
|
## Bugs
|
||||||
|
|
||||||
## Current Feature
|
## Current Feature
|
||||||
|
- [ ] FIX LONGBOW
|
||||||
- [ ] Copper Tools
|
- [ ] Copper Tools
|
||||||
- [ ] Craft Tweaker Support
|
- [ ] Craft Tweaker Support
|
||||||
- [ ] Config Usage
|
- [ ] Config Usage
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx3G
|
|||||||
mod_group=nmd.primal.forgecraft
|
mod_group=nmd.primal.forgecraft
|
||||||
mod_name=ForgeCraft
|
mod_name=ForgeCraft
|
||||||
|
|
||||||
mod_version=1.6.13
|
mod_version=1.6.14
|
||||||
forge_version=14.23.4.2744
|
forge_version=14.23.4.2744
|
||||||
mcp_mappings=snapshot_20171003
|
mcp_mappings=snapshot_20171003
|
||||||
mc_version=1.12.2
|
mc_version=1.12.2
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ public class ModInfo {
|
|||||||
//public static final String MOD_PREFIX = MOD_ID + ":";
|
//public static final String MOD_PREFIX = MOD_ID + ":";
|
||||||
public static final String MOD_CHANNEL = MOD_ID;
|
public static final String MOD_CHANNEL = MOD_ID;
|
||||||
|
|
||||||
public static final String MOD_VERSION = "1.6.13";
|
public static final String MOD_VERSION = "1.6.14";
|
||||||
public static final String MC_VERSIONS = "[1.12.0, 1.13.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.6.69,);";
|
public static final String DEPENDENCIES = "required-after:forge@[14.21.1.2400,);" + "required-after:primal@[0.6.69,);";
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ import nmd.primal.core.api.PrimalAPI;
|
|||||||
import nmd.primal.core.common.helper.RecipeHelper;
|
import nmd.primal.core.common.helper.RecipeHelper;
|
||||||
import nmd.primal.forgecraft.blocks.machine.Forge;
|
import nmd.primal.forgecraft.blocks.machine.Forge;
|
||||||
import nmd.primal.forgecraft.crafting.ForgeCrafting;
|
import nmd.primal.forgecraft.crafting.ForgeCrafting;
|
||||||
|
import nmd.primal.forgecraft.items.BaseMultiItem;
|
||||||
|
import nmd.primal.forgecraft.items.parts.ToolPart;
|
||||||
import nmd.primal.forgecraft.util.ToolNBT;
|
import nmd.primal.forgecraft.util.ToolNBT;
|
||||||
|
|
||||||
import static nmd.primal.core.api.PrimalAPI.randomCheck;
|
import static nmd.primal.core.api.PrimalAPI.randomCheck;
|
||||||
@@ -210,11 +212,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
|
|||||||
}
|
}
|
||||||
if (cookCounter2 >= recipe.getIdealTime()) {
|
if (cookCounter2 >= recipe.getIdealTime()) {
|
||||||
ItemStack outputStack = recipe.getOutput().copy();
|
ItemStack outputStack = recipe.getOutput().copy();
|
||||||
if(stack.hasTagCompound()){
|
outputNBTManager(stack, outputStack, stackCompound);
|
||||||
outputStack.setItemDamage(stack.getItemDamage());
|
|
||||||
outputStack.setTagCompound(stackCompound);
|
|
||||||
outputStack.getSubCompound("tags").setBoolean("hot", true);
|
|
||||||
}
|
|
||||||
this.setSlotStack(i, outputStack);
|
this.setSlotStack(i, outputStack);
|
||||||
cookCounter2 = 0;
|
cookCounter2 = 0;
|
||||||
}
|
}
|
||||||
@@ -228,11 +226,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
|
|||||||
}
|
}
|
||||||
if (cookCounter3 >= recipe.getIdealTime()) {
|
if (cookCounter3 >= recipe.getIdealTime()) {
|
||||||
ItemStack outputStack = recipe.getOutput().copy();
|
ItemStack outputStack = recipe.getOutput().copy();
|
||||||
if(stack.hasTagCompound()){
|
outputNBTManager(stack, outputStack, stackCompound);
|
||||||
outputStack.setItemDamage(stack.getItemDamage());
|
|
||||||
outputStack.setTagCompound(stackCompound);
|
|
||||||
outputStack.getSubCompound("tags").setBoolean("hot", true);
|
|
||||||
}
|
|
||||||
this.setSlotStack(i, outputStack);
|
this.setSlotStack(i, outputStack);
|
||||||
|
|
||||||
cookCounter3 = 0;
|
cookCounter3 = 0;
|
||||||
@@ -247,11 +241,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
|
|||||||
}
|
}
|
||||||
if (cookCounter4 >= recipe.getIdealTime()) {
|
if (cookCounter4 >= recipe.getIdealTime()) {
|
||||||
ItemStack outputStack = recipe.getOutput().copy();
|
ItemStack outputStack = recipe.getOutput().copy();
|
||||||
if(stack.hasTagCompound()){
|
outputNBTManager(stack, outputStack, stackCompound);
|
||||||
outputStack.setItemDamage(stack.getItemDamage());
|
|
||||||
outputStack.setTagCompound(stackCompound);
|
|
||||||
outputStack.getSubCompound("tags").setBoolean("hot", true);
|
|
||||||
}
|
|
||||||
this.setSlotStack(i, outputStack);
|
this.setSlotStack(i, outputStack);
|
||||||
cookCounter4 = 0;
|
cookCounter4 = 0;
|
||||||
}
|
}
|
||||||
@@ -265,11 +255,7 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
|
|||||||
}
|
}
|
||||||
if (cookCounter5 >= recipe.getIdealTime()) {
|
if (cookCounter5 >= recipe.getIdealTime()) {
|
||||||
ItemStack outputStack = recipe.getOutput().copy();
|
ItemStack outputStack = recipe.getOutput().copy();
|
||||||
if(stack.hasTagCompound()){
|
outputNBTManager(stack, outputStack, stackCompound);
|
||||||
outputStack.setItemDamage(stack.getItemDamage());
|
|
||||||
outputStack.setTagCompound(stackCompound);
|
|
||||||
outputStack.getSubCompound("tags").setBoolean("hot", true);
|
|
||||||
}
|
|
||||||
this.setSlotStack(i, outputStack);
|
this.setSlotStack(i, outputStack);
|
||||||
cookCounter5 = 0;
|
cookCounter5 = 0;
|
||||||
}
|
}
|
||||||
@@ -278,6 +264,24 @@ public class TileForge extends TileBaseSlot implements ITickable, ToolNBT{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private ItemStack outputNBTManager(ItemStack stack, ItemStack outputStack, NBTTagCompound stackCompound){
|
||||||
|
if(stack.hasTagCompound()){
|
||||||
|
if(stack.getItem() instanceof ToolPart) {
|
||||||
|
outputStack.setItemDamage(stack.getItemDamage());
|
||||||
|
outputStack.setTagCompound(stackCompound);
|
||||||
|
outputStack.getSubCompound("tags").setBoolean("hot", true);
|
||||||
|
return outputStack;
|
||||||
|
}
|
||||||
|
if(stack.getItem() instanceof BaseMultiItem) {
|
||||||
|
outputStack.setItemDamage(stack.getItemDamage());
|
||||||
|
outputStack.setTagCompound(stackCompound);
|
||||||
|
outputStack.getTagCompound().setBoolean("hot", true);
|
||||||
|
return outputStack;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public int getHeat(){
|
public int getHeat(){
|
||||||
return this.heat;
|
return this.heat;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"modid": "forgecraft",
|
"modid": "forgecraft",
|
||||||
"name": "Kitsu's Forgecraft",
|
"name": "Kitsu's Forgecraft",
|
||||||
"description": "Forged with sweat and blood",
|
"description": "Forged with sweat and blood",
|
||||||
"version": "1.6.13",
|
"version": "1.6.14",
|
||||||
"mcversion": "1.12.2",
|
"mcversion": "1.12.2",
|
||||||
"url": "",
|
"url": "",
|
||||||
"updateUrl": "",
|
"updateUrl": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user