Various fixes and additions #30
@ -37,7 +37,6 @@ import java.util.Optional;
|
||||
|
||||
public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
public static final int ENERGY_REQUIRED = 32;
|
||||
public static final int MAX_PROGRESS = 500;
|
||||
|
||||
private final ItemStackHandler inventory = new ItemStackHandler(3) {
|
||||
@Override
|
||||
@ -83,6 +82,7 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
private final LazyOptional<FluidTank> fluidOptional = LazyOptional.of(() -> fluid);
|
||||
|
||||
private int progress = 0;
|
||||
private int ticks = 0;
|
||||
private boolean active = false;
|
||||
|
||||
public InsolatorBlockEntity(BlockPos pPos, BlockState pBlockState) {
|
||||
@ -132,6 +132,7 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
nbt.put("fluid", fluid.writeToNBT(new CompoundTag()));
|
||||
nbt.put("energy", energy.serializeNBT());
|
||||
nbt.putInt("progress", progress);
|
||||
nbt.putInt("ticks", ticks);
|
||||
nbt.putBoolean("active", active);
|
||||
super.saveAdditional(nbt);
|
||||
}
|
||||
@ -143,6 +144,7 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
fluid.readFromNBT(nbt.getCompound("fluid"));
|
||||
energy.deserializeNBT(nbt.get("energy"));
|
||||
progress = nbt.getInt("progress");
|
||||
ticks = nbt.getInt("ticks");
|
||||
active = nbt.getBoolean("active");
|
||||
}
|
||||
|
||||
@ -164,21 +166,32 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
return;
|
||||
}
|
||||
|
||||
boolean newActive;
|
||||
boolean newActive = entity.active;
|
||||
|
||||
if (entity.canCraft().isPresent() && entity.hasEnoughEnergy()) {
|
||||
++entity.progress;
|
||||
newActive = true;
|
||||
entity.energy.extractEnergy(ENERGY_REQUIRED, false);
|
||||
setChanged(level, pos, state);
|
||||
|
||||
if (entity.progress >= MAX_PROGRESS) {
|
||||
entity.craftItem();
|
||||
}
|
||||
} else {
|
||||
entity.resetProgress();
|
||||
Optional<InsolatorRecipe> optionalInsolatorRecipe = entity.getRecipe();
|
||||
if (optionalInsolatorRecipe.isEmpty()) {
|
||||
newActive = false;
|
||||
setChanged(level, pos, state);
|
||||
} else {
|
||||
InsolatorRecipe insolatorRecipe = optionalInsolatorRecipe.get();
|
||||
if (entity.canCraft(insolatorRecipe) && entity.hasEnoughEnergy(insolatorRecipe)) {
|
||||
if (entity.progress == 0) {
|
||||
entity.ticks = insolatorRecipe.getTicks();
|
||||
}
|
||||
|
||||
++entity.progress;
|
||||
newActive = true;
|
||||
|
||||
entity.energy.extractEnergy(ENERGY_REQUIRED, false);
|
||||
setChanged(level, pos, state);
|
||||
|
||||
if (entity.progress >= insolatorRecipe.getTicks()) {
|
||||
entity.craftItem(insolatorRecipe);
|
||||
}
|
||||
} else {
|
||||
entity.resetProgress(insolatorRecipe.getTicks());
|
||||
newActive = false;
|
||||
setChanged(level, pos, state);
|
||||
}
|
||||
}
|
||||
|
||||
if (newActive != entity.active) {
|
||||
@ -210,18 +223,14 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
}
|
||||
}
|
||||
|
||||
private void resetProgress() {
|
||||
private void resetProgress(int newTicks) {
|
||||
this.progress = 0;
|
||||
this.ticks = newTicks;
|
||||
}
|
||||
|
||||
private void craftItem() {
|
||||
Optional<InsolatorRecipe> recipe = canCraft();
|
||||
if (recipe.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
private void craftItem(InsolatorRecipe recipe) {
|
||||
// Drain the amount of fluid specified in our recipe from the fluid tank
|
||||
fluid.drain(recipe.get().getFluid().getAmount(), IFluidHandler.FluidAction.EXECUTE);
|
||||
fluid.drain(recipe.getFluid().getAmount(), IFluidHandler.FluidAction.EXECUTE);
|
||||
|
||||
// Remove an item from the input slot.
|
||||
inventory.extractItem(1, 1, false);
|
||||
@ -229,47 +238,38 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
// Insert the recipe output in to the output slot.
|
||||
ItemStack output = inventory.getStackInSlot(2);
|
||||
if (output.isEmpty()) {
|
||||
inventory.setStackInSlot(2, recipe.get().getResultItem().copy());
|
||||
inventory.setStackInSlot(2, recipe.getResultItem().copy());
|
||||
} else {
|
||||
output.grow(recipe.get().getResultItem().getCount());
|
||||
output.grow(recipe.getResultItem().getCount());
|
||||
}
|
||||
|
||||
resetProgress();
|
||||
resetProgress(recipe.getTicks());
|
||||
}
|
||||
|
||||
private boolean hasEnoughEnergy() {
|
||||
return energy.getEnergyStored() >= ENERGY_REQUIRED * MAX_PROGRESS;
|
||||
private boolean hasEnoughEnergy(InsolatorRecipe recipe) {
|
||||
return energy.getEnergyStored() >= ENERGY_REQUIRED * recipe.getTicks();
|
||||
}
|
||||
|
||||
private Optional<InsolatorRecipe> canCraft() {
|
||||
Optional<InsolatorRecipe> recipe = getRecipe();
|
||||
if (recipe.isEmpty()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private boolean canCraft(InsolatorRecipe recipe) {
|
||||
// Make sure that the correct fluid is in the tank.
|
||||
if (!fluid.getFluid().equals(recipe.get().getFluid())) {
|
||||
return Optional.empty();
|
||||
if (!fluid.getFluid().equals(recipe.getFluid())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Ensure that we have enough fluid
|
||||
if (fluid.getFluidAmount() < recipe.get().getFluid().getAmount()) {
|
||||
return Optional.empty();
|
||||
if (fluid.getFluidAmount() < recipe.getFluid().getAmount()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
ItemStack output = inventory.getStackInSlot(2);
|
||||
|
||||
// If the output isn't empty, and the item in the output is different to the output of the recipe, we cannot process.
|
||||
if (!output.isEmpty() && output.getItem() != recipe.get().getResultItem().getItem()) {
|
||||
return Optional.empty();
|
||||
if (!output.isEmpty() && output.getItem() != recipe.getResultItem().getItem()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Make sure that the output is not saturated.
|
||||
if (output.getCount() + recipe.get().getResultItem().getCount() > output.getMaxStackSize()) {
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
return recipe;
|
||||
return output.getCount() + recipe.getResultItem().getCount() <= output.getMaxStackSize();
|
||||
}
|
||||
|
||||
private Optional<InsolatorRecipe> getRecipe() {
|
||||
@ -313,4 +313,8 @@ public class InsolatorBlockEntity extends BlockEntity implements MenuProvider {
|
||||
public int getProgress() {
|
||||
return this.progress;
|
||||
}
|
||||
|
||||
public int getTicks() {
|
||||
return this.ticks;
|
||||
}
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ import dan200.computercraft.api.lua.LuaFunction;
|
||||
import dan200.computercraft.api.lua.MethodResult;
|
||||
import net.banutama.utamacraft.block.entity.InsolatorBlockEntity;
|
||||
import net.banutama.utamacraft.integrations.computercraft.utils.WrapResult;
|
||||
import net.banutama.utamacraft.recipe.InsolatorRecipe;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
@ -42,7 +43,7 @@ public class InsolatorPeripheral extends BasePeripheral {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
result.put("active", insolator.getActive());
|
||||
result.put("progress", insolator.getProgress());
|
||||
result.put("maxProgress", InsolatorBlockEntity.MAX_PROGRESS);
|
||||
result.put("ticks", insolator.getTicks());
|
||||
result.put("energy", WrapResult.wrap(insolator.getEnergy()));
|
||||
insolator.getInventoryOptional().ifPresent(inventory -> result.put("inventory", WrapResult.wrap(inventory)));
|
||||
|
||||
|
@ -20,12 +20,14 @@ public class InsolatorRecipe implements Recipe<SimpleContainer> {
|
||||
private final ItemStack output;
|
||||
private final Ingredient input;
|
||||
private final FluidStack fluid;
|
||||
private final int ticks;
|
||||
|
||||
public InsolatorRecipe(ResourceLocation id, ItemStack output, Ingredient input, FluidStack fluid) {
|
||||
public InsolatorRecipe(ResourceLocation id, ItemStack output, Ingredient input, FluidStack fluid, int ticks) {
|
||||
this.id = id;
|
||||
this.output = output;
|
||||
this.input = input;
|
||||
this.fluid = fluid;
|
||||
this.ticks = ticks;
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -51,6 +53,10 @@ public class InsolatorRecipe implements Recipe<SimpleContainer> {
|
||||
return fluid;
|
||||
}
|
||||
|
||||
public int getTicks() {
|
||||
return ticks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull ItemStack getResultItem() {
|
||||
return output.copy();
|
||||
@ -87,7 +93,8 @@ public class InsolatorRecipe implements Recipe<SimpleContainer> {
|
||||
ItemStack output = ShapedRecipe.itemStackFromJson(GsonHelper.getAsJsonObject(pSerializedRecipe, "output"));
|
||||
Ingredient input = Ingredient.fromJson(pSerializedRecipe.getAsJsonObject("input"));
|
||||
FluidStack fluid = FluidStack.CODEC.decode(JsonOps.INSTANCE, pSerializedRecipe.get("fluid")).result().orElseThrow().getFirst();
|
||||
return new InsolatorRecipe(pRecipeId, output, input, fluid);
|
||||
int ticks = pSerializedRecipe.get("ticks").getAsInt();
|
||||
return new InsolatorRecipe(pRecipeId, output, input, fluid, ticks);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -95,7 +102,8 @@ public class InsolatorRecipe implements Recipe<SimpleContainer> {
|
||||
ItemStack output = pBuffer.readItem();
|
||||
Ingredient input = Ingredient.fromNetwork(pBuffer);
|
||||
FluidStack fluid = pBuffer.readFluidStack();
|
||||
return new InsolatorRecipe(pRecipeId, output, input, fluid);
|
||||
int ticks = pBuffer.readInt();
|
||||
return new InsolatorRecipe(pRecipeId, output, input, fluid, ticks);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -103,6 +111,7 @@ public class InsolatorRecipe implements Recipe<SimpleContainer> {
|
||||
pBuffer.writeItemStack(pRecipe.output, false);
|
||||
pRecipe.input.toNetwork(pBuffer);
|
||||
pBuffer.writeFluidStack(pRecipe.fluid);
|
||||
pBuffer.writeInt(pRecipe.ticks);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2,8 +2,10 @@ package net.banutama.utamacraft.screen;
|
||||
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.logging.LogUtils;
|
||||
import net.banutama.utamacraft.Utamacraft;
|
||||
import net.banutama.utamacraft.block.entity.InsolatorBlockEntity;
|
||||
import net.banutama.utamacraft.recipe.InsolatorRecipe;
|
||||
import net.banutama.utamacraft.screen.utils.FluidSprite;
|
||||
import net.banutama.utamacraft.screen.utils.MouseUtils;
|
||||
import net.banutama.utamacraft.screen.utils.TiledSprite;
|
||||
@ -104,8 +106,11 @@ public class InsolatorScreen extends AbstractContainerScreen<InsolatorMenu> {
|
||||
|
||||
private void renderProgressArrow(PoseStack stack, int x, int y) {
|
||||
if (menu.getBlockEntity().getActive()) {
|
||||
float ratio = (float)menu.getBlockEntity().getProgress() / (float)InsolatorBlockEntity.MAX_PROGRESS;
|
||||
blit(stack, x + 90, y + 33, 176, 0, 8, (int)(25.0f * ratio));
|
||||
int ticks = menu.getBlockEntity().getTicks();
|
||||
if (ticks != 0) {
|
||||
float ratio = (float)menu.getBlockEntity().getProgress() / (float)ticks;
|
||||
blit(stack, x + 90, y + 33, 176, 0, 8, (int)(25.0f * ratio));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:acacia_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:acacia_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:acacia_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:acacia_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:allium"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:azalea"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:azalea_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:azalea_leaves",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:azure_bluet"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:bamboo"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:beetroot_seeds"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:big_dripleaf"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:birch_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:birch_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:birch_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:birch_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:blue_orchid"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:brown_mushroom"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:cactus"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:chorus_flower"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:cornflower"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:crimson_fungus"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:crimson_roots"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:dandelion"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:dark_oak_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:dark_oak_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:dark_oak_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:dark_oak_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:fern"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:flowering_azalea"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:flowering_azalea_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:flowering_azalea_leaves",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:glow_lichen"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:grass"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:hanging_roots"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:jungle_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:jungle_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:jungle_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:jungle_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:kelp"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:large_fern"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:lilac"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:lily_of_the_valley"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:mangrove_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:mangrove_leaves",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:melon"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:moss_block"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:moss_carpet"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:nether_sprouts"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:nether_wart"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:oak_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:oak_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:oak_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:oak_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:orange_tulip"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:oxeye_daisy"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:peony"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:pink_tulip"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:poppy"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:potato"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:pumpkin"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:red_mushroom"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:red_tulip"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:rose_bush"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:sea_pickle"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:seagrass"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:small_dripleaf"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:spore_blossom"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:spruce_leaves"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:spruce_leaves",
|
||||
|
@ -3,9 +3,10 @@
|
||||
"input": {
|
||||
"item": "minecraft:spruce_sapling"
|
||||
},
|
||||
"ticks": 1000,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": 1000
|
||||
},
|
||||
"output": {
|
||||
"item": "minecraft:spruce_sapling",
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:sugar_cane"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:sunflower"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:tall_grass"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:twisting_vines"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:vine"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:warped_fungus"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:warped_roots"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:weeping_vines"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:wheat_seeds"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:white_tulip"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -3,6 +3,7 @@
|
||||
"input": {
|
||||
"item": "minecraft:wither_rose"
|
||||
},
|
||||
"ticks": 500,
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
|
@ -77,19 +77,33 @@ ITEMS = [
|
||||
# "minecraft:torchflower", TODO: 1.20
|
||||
]
|
||||
|
||||
def basicTicksFor(item: str) -> int:
|
||||
if item.endswith("_leaves") or item.endswith("_sapling"):
|
||||
return 1000
|
||||
return 500
|
||||
|
||||
def basicWaterFor(item: str) -> int:
|
||||
if item.endswith("_leaves") or item.endswith("_sapling"):
|
||||
return 1000
|
||||
return 500
|
||||
|
||||
for item in ITEMS:
|
||||
namespace, item_name = item.split(":")
|
||||
with open(f"src/main/resources/data/utamacraft/recipes/insolator_{namespace}_{item_name}.json", "w") as fp:
|
||||
fp.write(json.dumps({
|
||||
"type": "utamacraft:insolator",
|
||||
"input": { "item": item },
|
||||
"ticks": basicTicksFor(item),
|
||||
"fluid": {
|
||||
"FluidName": "minecraft:water",
|
||||
"Amount": 500
|
||||
"Amount": basicWaterFor(item)
|
||||
},
|
||||
"output": { "item": item, "count": 2 }
|
||||
}, indent=2))
|
||||
|
||||
with open("insolator-recipes.md", "w") as fp:
|
||||
for item in ITEMS:
|
||||
fp.write(f"| [{item}] | 500 | 16,000 | 500 | 25 |\n")
|
||||
ticks = basicTicksFor(item)
|
||||
energy = 32 * ticks
|
||||
water = basicWaterFor(item)
|
||||
fp.write(f"| [{item}] | {water} | {energy} | {ticks} | {ticks / 20} |\n")
|
||||
|
Loading…
Reference in New Issue
Block a user