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

updating with current code

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-10-02 19:10:03 -04:00
parent bf125d564f
commit 0b16ea1138
4 changed files with 99 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
kfc/src/main/java/nmd/primal/forgecraft/compat/ct/CTCrucible.java
View File

@@ -8,6 +8,7 @@ import crafttweaker.annotations.ZenRegister;
import crafttweaker.api.item.IIngredient;
import crafttweaker.api.item.IItemStack;
import crafttweaker.api.item.IngredientStack;
import crafttweaker.api.minecraft.CraftTweakerMC;
import crafttweaker.api.oredict.IOreDictEntry;
import crafttweaker.api.oredict.IngredientOreDict;
import net.minecraft.item.ItemStack;
@@ -22,6 +23,7 @@ import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import java.util.List;
import java.util.stream.Collectors;
@ZenClass("mods.forgecraft.NBTCrucible")
@ModOnly(ModInfo.MOD_ID)
@@ -48,7 +50,8 @@ public class CTCrucible {
int coolTime,
String recipe_name)
{
CraftTweakerAPI.apply(new Add( ing0,
CraftTweakerAPI.apply(new Add(
ing0.getItems().stream().map(CraftTweakerMC::getItemStack).collect(Collectors.toList()),
ing1,
ing2,
ing3,
@@ -81,92 +84,19 @@ public class CTCrucible {
private final ItemStack dropsRaw;
private boolean isDisabled, isHidden;
public Add(IIngredient I0, IIngredient I1, IIngredient I2, IIngredient I3, IIngredient I4, ItemStack dropsRaw, ItemStack dropsCooked, int cookTemp, int cookTime, int coolTime, String recipe_name)
public Add(Ingredient I0, Ingredient I1, Ingredient I2, Ingredient I3, Ingredient I4, ItemStack dropsRaw, ItemStack dropsCooked, int cookTemp, int cookTime, int coolTime, String recipe_name)
{
Ingredient temp0 = null;
NonNullList<ItemStack> list0 = NonNullList.create();
Ingredient temp1 = null;
List<ItemStack> list1 = NonNullList.create();
Ingredient temp2 = null;
List<ItemStack> list2 = NonNullList.create();
Ingredient temp3 = null;
List<ItemStack> list3 = NonNullList.create();
Ingredient temp4 = null;
List<ItemStack> list4 = NonNullList.create();
List<IItemStack> zeroIList = I0.getItems();
List<IItemStack> oneIList = I1.getItems();
List<IItemStack> twoIList = I2.getItems();
List<IItemStack> threeIList = I3.getItems();
List<IItemStack> fourIList = I4.getItems();
System.out.println(I0.getItems());
if(I1.getInternal() == new OreIngredient("oreIron") ){
System.out.println("This is an IoreDictEntry");
}
if(I1.getInternal() instanceof IngredientOreDict){
System.out.println("This is an IngredientOreDict");
}
System.out.println(I1);
System.out.println(I1.getInternal());
System.out.println(I2.getItems());
System.out.println(I3.getItems());
System.out.println(I4.getItems());
System.out.println(zeroIList);
System.out.println(oneIList.size());
System.out.println(twoIList);
System.out.println(threeIList);
System.out.println(fourIList);
for (int i=0; i < zeroIList.size(); i++) {
list0.add(i, (ItemStack)zeroIList.get(i).getInternal());
}
for (int i=0; i < list0.size(); i++) {
temp0.fromStacks(list0.get(i));
}
//instanceof IOreDictEntry
if(I1 instanceof IOreDictEntry){
temp1 = new OreIngredient((String) I1.getInternal());
} else {
for (int i = 0; i < oneIList.size(); i++) {
temp1.apply((ItemStack) zeroIList.get(i).getInternal());
}
for (int i = 0; i < list1.size(); i++) {
temp1.fromStacks(list1.get(i));
}
}
for (int i=0; i < twoIList.size(); i++) {
list2.add(i, (ItemStack)twoIList.get(i).getInternal());
}
for (int i=0; i < list2.size(); i++) {
temp2.fromStacks(list2.get(i));
}
for (int i=0; i < threeIList.size(); i++) {
list3.add(i, (ItemStack)threeIList.get(i).getInternal());
}
for (int i=0; i < list3.size(); i++) {
temp3.fromStacks(list3.get(i));
}
for (int i=0; i < fourIList.size(); i++) {
list4.add(i, (ItemStack)fourIList.get(i).getInternal());
}
for (int i=0; i < list4.size(); i++) {
temp4.fromStacks(list4.get(i));
}
this.recipe_name = recipe_name;
this.cookTemp = cookTemp;
this.cookTime = cookTime;
this.coolTime = coolTime;
this.ing0 = temp0;
this.ing1 = temp1;
this.ing2 = temp2;
this.ing3 = temp3;
this.ing4 = temp4;
this.ing0 = I0;
this.ing1 = I1;
this.ing2 = I2;
this.ing3 = I3;
this.ing4 = I4;
this.dropsCooked = dropsCooked;
this.dropsRaw = dropsRaw;
this.isDisabled = false;

61
kfc/src/main/java/nmd/primal/forgecraft/crafting/CrucibleCrafting.java
View File

@@ -1,5 +1,6 @@
package nmd.primal.forgecraft.crafting;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.Ingredient;
import net.minecraftforge.registries.IForgeRegistry;
@@ -119,9 +120,49 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
this.coolTime = coolTime;
}
public static boolean compare(Ingredient ingredient, ItemStack stack){
if(stack == null){
stack = new ItemStack(Items.AIR, 1);
}
if(ingredient == null && stack.isEmpty()) {
return true;
}
if (ingredient.test(ItemStack.EMPTY)) {
if (stack.isEmpty()) {
return true;
}
}
if(ingredient.apply(stack)){
return true;
}
return false;
}
public static boolean isRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack i4){
for(CrucibleCrafting recipe : RECIPES){
if(recipe.ing0.apply(i0) && recipe.ing1.apply(i1) && recipe.ing2.apply(i2) && recipe.ing3.apply(i3) && recipe.ing4.apply(i4) ){
if(i0 == null){
i0 = ItemStack.EMPTY;
}
if(i1 == null){
i1 = ItemStack.EMPTY;
}
if(i2 == null){
i2 = ItemStack.EMPTY;
}
if(i3 == null){
i3 = ItemStack.EMPTY;
}
if(i4 == null){
i4 = ItemStack.EMPTY;
}
if(compare(recipe.ing0, i0) &&
compare(recipe.ing1, i1) &&
compare(recipe.ing2, i2) &&
compare(recipe.ing3, i3) &&
compare(recipe.ing4, i4) ){
return true;
}
}
@@ -130,7 +171,23 @@ public class CrucibleCrafting extends AbstractRecipe<CrucibleCrafting> { //exten
public static CrucibleCrafting getRecipe(ItemStack i0, ItemStack i1, ItemStack i2, ItemStack i3, ItemStack i4){
for(CrucibleCrafting recipe : RECIPES){
System.out.println(i0 + " : " + i1 + " : " + i2 + " : " + i3 + " : " + i4);
if(i0 == null){
i0 = ItemStack.EMPTY;
}
if(i1 == null){
i1 = ItemStack.EMPTY;
}
if(i2 == null){
i2 = ItemStack.EMPTY;
}
if(i3 == null){
i3 = ItemStack.EMPTY;
}
if(i4 == null){
i4 = ItemStack.EMPTY;
}
if(recipe.ing0.apply(i0) && recipe.ing1.apply(i1) && recipe.ing2.apply(i2) && recipe.ing3.apply(i3) && recipe.ing4.apply(i4) ){
return recipe;
}

56
kfc/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java
View File

@@ -78,33 +78,35 @@ public class TileBloomery extends TileBaseSlot implements ITickable {
//System.out.println(tag);
ItemStackHelper.loadAllItems(tag, ingList);
ItemStackHelper.loadAllItems(tag, dropList);
@Nullable CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4));
if (recipe != null) {
if(!recipe.isDisabled()) {
if (this.getHeat() >= recipe.getCookTemp() &&
!this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
cookCounter++;
//this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true);
//System.out.println("Cooking");
this.updateBlock();
this.markDirty();
}
if (cookCounter >= (recipe.getCookTime() / 4) && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("hot", 15);
//System.out.println("hot");
this.updateBlock();
this.markDirty();
}
if (cookCounter >= recipe.getCookTime() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("status", true);
this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("heat", this.getHeat());
cookCounter = 0;
//System.out.println("Cooked");
this.updateBlock();
this.markDirty();
}
if (this.getSlotStack(1).isEmpty()) {
this.cookCounter = 0;
if(CrucibleCrafting.isRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4))) {
CrucibleCrafting recipe = CrucibleCrafting.getRecipe(ingList.get(0), ingList.get(1), ingList.get(2), ingList.get(3), ingList.get(4));
if (recipe != null) {
if (!recipe.isDisabled()) {
if (this.getHeat() >= recipe.getCookTemp() &&
!this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
cookCounter++;
//this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("hot", true);
//System.out.println("Cooking");
this.updateBlock();
this.markDirty();
}
if (cookCounter >= (recipe.getCookTime() / 4) && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("hot", 15);
//System.out.println("hot");
this.updateBlock();
this.markDirty();
}
if (cookCounter >= recipe.getCookTime() && !this.getSlotStack(1).getSubCompound("BlockEntityTag").getBoolean("status")) {
this.getSlotStack(1).getSubCompound("BlockEntityTag").setBoolean("status", true);
this.getSlotStack(1).getSubCompound("BlockEntityTag").setInteger("heat", this.getHeat());
cookCounter = 0;
//System.out.println("Cooked");
this.updateBlock();
this.markDirty();
}
if (this.getSlotStack(1).isEmpty()) {
this.cookCounter = 0;
}
}
}
}

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

@@ -69,7 +69,7 @@ public class TileNBTCrucible extends BaseTile implements ITickable {
if (!world.isRemote) {
World world = this.getWorld();
IBlockState state = world.getBlockState(this.pos);
//dropsManager();
dropsManager();
coolManager(this.pos, world, state);
}
}