1.12: Backported E-Furnace/Labeled Crate from 1.14/1.15.
This commit is contained in:
stfwi
parent
27a957ba8d
commit
41b48208a0
55 changed files with 2556 additions and 34 deletions
|
|
@ -2,7 +2,7 @@
|
|||
org.gradle.daemon=false
|
||||
org.gradle.jvmargs=-Xmx8G
|
||||
version_minecraft=1.15.2
|
||||
version_forge_minecraft=1.15.2-31.1.19
|
||||
version_forge_minecraft=1.15.2-31.1.25
|
||||
version_fml_mappings=20200225-1.15.1
|
||||
version_jei=1.15.2:6.0.0.2
|
||||
version_engineersdecor=1.0.20-b1
|
||||
version_engineersdecor=1.0.20-b2
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.15.1.
|
|||
|
||||
## Version history
|
||||
|
||||
~ v1.0.20-b2 [A] Added Labeled Crate (storage crate with built-in item frame).
|
||||
|
||||
- v1.0.20-b1 [A] Electrical Furnace: Added four-position speed switch (off, 100%, 150%, 200%), power consumption
|
||||
increases at higher rate (off, 100%, 200%, 400%).
|
||||
[A] Added Steel Mesh Fence Gate (single or double height gate fitting to the Steel Mesh Fence).
|
||||
|
|
|
|||
|
|
@ -591,6 +591,12 @@ public class ModContent
|
|||
}
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "small_fluid_funnel"));
|
||||
|
||||
public static final BlockDecorLabeledCrate.DecorLabeledCrateBlock LABELED_CRATE = (BlockDecorLabeledCrate.DecorLabeledCrateBlock)(new BlockDecorLabeledCrate.DecorLabeledCrateBlock(
|
||||
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_OPPOSITE_PLACEMENT,
|
||||
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(0.5f, 128f).sound(SoundType.METAL).notSolid(),
|
||||
Auxiliaries.getPixeledAABB(0,0,0, 16,16,16)
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "labeled_crate"));
|
||||
|
||||
// -------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
public static final BlockDecorWall CONCRETE_WALL = (BlockDecorWall)(new BlockDecorWall(
|
||||
|
|
@ -659,6 +665,7 @@ public class ModContent
|
|||
|
||||
private static final Block modBlocks[] = {
|
||||
TREATED_WOOD_CRAFTING_TABLE,
|
||||
LABELED_CRATE,
|
||||
SMALL_LAB_FURNACE,
|
||||
SMALL_ELECTRICAL_FURNACE,
|
||||
FACTORY_HOPPER,
|
||||
|
|
@ -754,6 +761,11 @@ public class ModContent
|
|||
.build(null)
|
||||
.setRegistryName(ModEngineersDecor.MODID, "te_treated_wood_crafting_table");
|
||||
|
||||
public static final TileEntityType<?> TET_LABELED_CRATE = TileEntityType.Builder
|
||||
.create(BlockDecorLabeledCrate.LabeledCrateTileEntity::new, LABELED_CRATE)
|
||||
.build(null)
|
||||
.setRegistryName(ModEngineersDecor.MODID, "te_labeled_crate");
|
||||
|
||||
public static final TileEntityType<?> TET_SMALL_LAB_FURNACE = TileEntityType.Builder
|
||||
.create(BlockDecorFurnace.BTileEntity::new, SMALL_LAB_FURNACE)
|
||||
.build(null)
|
||||
|
|
@ -831,6 +843,7 @@ public class ModContent
|
|||
|
||||
private static final TileEntityType<?> tile_entity_types[] = {
|
||||
TET_TREATED_WOOD_CRAFTING_TABLE,
|
||||
TET_LABELED_CRATE,
|
||||
TET_SMALL_LAB_FURNACE,
|
||||
TET_SMALL_ELECTRICAL_FURNACE,
|
||||
TET_FACTORY_HOPPER,
|
||||
|
|
@ -878,6 +891,7 @@ public class ModContent
|
|||
public static final ContainerType<BlockDecorFurnace.BContainer> CT_SMALL_LAB_FURNACE;
|
||||
public static final ContainerType<BlockDecorFurnaceElectrical.BContainer> CT_SMALL_ELECTRICAL_FURNACE;
|
||||
public static final ContainerType<BlockDecorWasteIncinerator.BContainer> CT_WASTE_INCINERATOR;
|
||||
public static final ContainerType<BlockDecorLabeledCrate.BContainer> CT_LABELED_CRATE;
|
||||
|
||||
static {
|
||||
CT_TREATED_WOOD_CRAFTING_TABLE = (new ContainerType<BlockDecorCraftingTable.CraftingTableContainer>(BlockDecorCraftingTable.CraftingTableContainer::new));
|
||||
|
|
@ -894,11 +908,14 @@ public class ModContent
|
|||
CT_SMALL_ELECTRICAL_FURNACE.setRegistryName(ModEngineersDecor.MODID,"ct_small_electrical_furnace");
|
||||
CT_WASTE_INCINERATOR = (new ContainerType<BlockDecorWasteIncinerator.BContainer>(BlockDecorWasteIncinerator.BContainer::new));
|
||||
CT_WASTE_INCINERATOR.setRegistryName(ModEngineersDecor.MODID,"ct_small_waste_incinerator");
|
||||
CT_LABELED_CRATE = (new ContainerType<BlockDecorLabeledCrate.BContainer>(BlockDecorLabeledCrate.BContainer::new));
|
||||
CT_LABELED_CRATE.setRegistryName(ModEngineersDecor.MODID,"ct_labeled_crate");
|
||||
}
|
||||
|
||||
// DON'T FORGET TO REGISTER THE GUI in registerContainerGuis(), no list/map format found yet for that.
|
||||
private static final ContainerType<?> container_types[] = {
|
||||
CT_TREATED_WOOD_CRAFTING_TABLE,
|
||||
CT_LABELED_CRATE,
|
||||
CT_FACTORY_DROPPER,
|
||||
CT_FACTORY_PLACER,
|
||||
CT_FACTORY_HOPPER,
|
||||
|
|
@ -982,6 +999,7 @@ public class ModContent
|
|||
public static final void registerContainerGuis(final FMLClientSetupEvent event)
|
||||
{
|
||||
ScreenManager.registerFactory(CT_TREATED_WOOD_CRAFTING_TABLE, BlockDecorCraftingTable.CraftingTableGui::new);
|
||||
ScreenManager.registerFactory(CT_LABELED_CRATE, BlockDecorLabeledCrate.BGui::new);
|
||||
ScreenManager.registerFactory(CT_FACTORY_DROPPER, BlockDecorDropper.BGui::new);
|
||||
ScreenManager.registerFactory(CT_FACTORY_PLACER, BlockDecorPlacer.BGui::new);
|
||||
ScreenManager.registerFactory(CT_FACTORY_HOPPER, BlockDecorHopper.BGui::new);
|
||||
|
|
@ -998,6 +1016,10 @@ public class ModContent
|
|||
(TileEntityType<BlockDecorCraftingTable.CraftingTableTileEntity>)TET_TREATED_WOOD_CRAFTING_TABLE,
|
||||
wile.engineersdecor.detail.ModRenderers.CraftingTableTer::new
|
||||
);
|
||||
ClientRegistry.bindTileEntityRenderer(
|
||||
(TileEntityType<BlockDecorLabeledCrate.LabeledCrateTileEntity>)TET_LABELED_CRATE,
|
||||
wile.engineersdecor.detail.ModRenderers.DecorLabeledCrateTer::new
|
||||
);
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace implements ID
|
|||
fifo_timer_ = 0;
|
||||
tick_timer_ = 0;
|
||||
energy_stored_ = 0;
|
||||
speed_ = 0;
|
||||
speed_ = 1;
|
||||
field_max_energy_stored_ = getMaxEnergyStored();
|
||||
field_isburning_ = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@
|
|||
*/
|
||||
package wile.engineersdecor.blocks;
|
||||
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
import wile.engineersdecor.ModContent;
|
||||
import wile.engineersdecor.ModEngineersDecor;
|
||||
import wile.engineersdecor.libmc.detail.Inventories;
|
||||
|
|
@ -37,6 +35,8 @@ import net.minecraft.inventory.container.Slot;
|
|||
import net.minecraft.util.*;
|
||||
import net.minecraft.util.math.*;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShapes;
|
||||
import net.minecraft.util.text.*;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,597 @@
|
|||
/*
|
||||
* @file BlockDecorLabeledCrate.java
|
||||
* @author Stefan Wilhelm (wile)
|
||||
* @copyright (C) 2019 Stefan Wilhelm
|
||||
* @license MIT (see https://opensource.org/licenses/MIT)
|
||||
*
|
||||
* Storage crate with a content hint.
|
||||
*/
|
||||
package wile.engineersdecor.blocks;
|
||||
|
||||
import wile.engineersdecor.ModContent;
|
||||
import wile.engineersdecor.ModEngineersDecor;
|
||||
import wile.engineersdecor.libmc.blocks.StandardBlocks;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.server.ServerWorld;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.block.material.PushReaction;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.PlayerInventory;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.inventory.*;
|
||||
import net.minecraft.inventory.container.INamedContainerProvider;
|
||||
import net.minecraft.inventory.container.Container;
|
||||
import net.minecraft.inventory.container.Slot;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.text.StringTextComponent;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
|
||||
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.util.FakePlayer;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.fml.network.NetworkHooks;
|
||||
import net.minecraftforge.items.CapabilityItemHandler;
|
||||
import net.minecraftforge.items.IItemHandler;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class BlockDecorLabeledCrate
|
||||
{
|
||||
public static void on_config(int stack_limit)
|
||||
{
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
// Block
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
public static class DecorLabeledCrateBlock extends StandardBlocks.Horizontal implements IDecorBlock
|
||||
{
|
||||
public DecorLabeledCrateBlock(long config, Block.Properties builder, final AxisAlignedBB unrotatedAABB)
|
||||
{ super(config, builder, unrotatedAABB); }
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public boolean hasComparatorInputOverride(BlockState state)
|
||||
{ return true; }
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public int getComparatorInputOverride(BlockState blockState, World world, BlockPos pos)
|
||||
{ return Container.calcRedstone(world.getTileEntity(pos)); }
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(BlockState state)
|
||||
{ return true; }
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public TileEntity createTileEntity(BlockState state, IBlockReader world)
|
||||
{ return new LabeledCrateTileEntity(); }
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack)
|
||||
{
|
||||
if(world.isRemote) return;
|
||||
if((!stack.hasTag()) || (!stack.getTag().contains("tedata"))) return;
|
||||
CompoundNBT te_nbt = stack.getTag().getCompound("tedata");
|
||||
if(te_nbt.isEmpty()) return;
|
||||
final TileEntity te = world.getTileEntity(pos);
|
||||
if(!(te instanceof LabeledCrateTileEntity)) return;
|
||||
((LabeledCrateTileEntity)te).readnbt(te_nbt);
|
||||
((LabeledCrateTileEntity)te).markDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasDynamicDropList()
|
||||
{ return true; }
|
||||
|
||||
@Override
|
||||
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
|
||||
{
|
||||
final List<ItemStack> stacks = new ArrayList<ItemStack>();
|
||||
if(world.isRemote) return stacks;
|
||||
final TileEntity te = world.getTileEntity(pos);
|
||||
if(!(te instanceof LabeledCrateTileEntity)) return stacks;
|
||||
if(!explosion) {
|
||||
ItemStack stack = new ItemStack(this, 1);
|
||||
CompoundNBT te_nbt = ((LabeledCrateTileEntity) te).reset_getnbt();
|
||||
if(!te_nbt.isEmpty()) {
|
||||
CompoundNBT nbt = new CompoundNBT();
|
||||
nbt.put("tedata", te_nbt);
|
||||
stack.setTag(nbt);
|
||||
}
|
||||
stacks.add(stack);
|
||||
} else {
|
||||
for(ItemStack stack: ((LabeledCrateTileEntity)te).stacks_) stacks.add(stack);
|
||||
((LabeledCrateTileEntity)te).reset_getnbt();
|
||||
}
|
||||
return stacks;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult)
|
||||
{
|
||||
if(world.isRemote) return ActionResultType.SUCCESS;
|
||||
final TileEntity te = world.getTileEntity(pos);
|
||||
if(!(te instanceof LabeledCrateTileEntity)) return ActionResultType.SUCCESS;
|
||||
if((!(player instanceof ServerPlayerEntity) && (!(player instanceof FakePlayer)))) return ActionResultType.SUCCESS;
|
||||
NetworkHooks.openGui((ServerPlayerEntity)player,(INamedContainerProvider)te);
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PushReaction getPushReaction(BlockState state)
|
||||
{ return PushReaction.BLOCK; }
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
// Tile entity
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
public static class LabeledCrateTileEntity extends TileEntity implements INameable, IInventory, INamedContainerProvider, ISidedInventory
|
||||
{
|
||||
public static final int NUM_OF_FIELDS = 1;
|
||||
public static final int NUM_OF_SLOTS = 55;
|
||||
public static final int ITEMFRAME_SLOTNO = 54;
|
||||
|
||||
// BTileEntity -----------------------------------------------------------------------------
|
||||
|
||||
protected NonNullList<ItemStack> stacks_ = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
|
||||
|
||||
public LabeledCrateTileEntity()
|
||||
{ this(ModContent.TET_LABELED_CRATE); }
|
||||
|
||||
public LabeledCrateTileEntity(TileEntityType<?> te_type)
|
||||
{ super(te_type); reset(); }
|
||||
|
||||
public CompoundNBT reset_getnbt()
|
||||
{
|
||||
CompoundNBT nbt = new CompoundNBT();
|
||||
writenbt(nbt);
|
||||
reset();
|
||||
return nbt;
|
||||
}
|
||||
|
||||
protected void reset()
|
||||
{
|
||||
stacks_ = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
public void readnbt(CompoundNBT compound)
|
||||
{
|
||||
NonNullList<ItemStack> stacks = NonNullList.<ItemStack>withSize(NUM_OF_SLOTS, ItemStack.EMPTY);
|
||||
ItemStackHelper.loadAllItems(compound, stacks);
|
||||
while(stacks.size() < NUM_OF_SLOTS) stacks.add(ItemStack.EMPTY);
|
||||
stacks_ = stacks;
|
||||
}
|
||||
|
||||
protected void writenbt(CompoundNBT compound)
|
||||
{
|
||||
ItemStackHelper.saveAllItems(compound, stacks_);
|
||||
}
|
||||
|
||||
public ItemStack getItemFrameStack()
|
||||
{ return (stacks_.size() > ITEMFRAME_SLOTNO) ? (stacks_.get(ITEMFRAME_SLOTNO)) : (ItemStack.EMPTY); }
|
||||
|
||||
// TileEntity ------------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public void read(CompoundNBT compound)
|
||||
{ super.read(compound); readnbt(compound); }
|
||||
|
||||
@Override
|
||||
public CompoundNBT write(CompoundNBT compound)
|
||||
{ super.write(compound); writenbt(compound); return compound; }
|
||||
|
||||
@Override
|
||||
public CompoundNBT getUpdateTag()
|
||||
{ CompoundNBT nbt = super.getUpdateTag(); writenbt(nbt); return nbt; }
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public SUpdateTileEntityPacket getUpdatePacket()
|
||||
{ return new SUpdateTileEntityPacket(pos, 1, getUpdateTag()); }
|
||||
|
||||
@Override
|
||||
public void onDataPacket(NetworkManager net, SUpdateTileEntityPacket pkt) // on client
|
||||
{ super.read(pkt.getNbtCompound()); readnbt(pkt.getNbtCompound()); super.onDataPacket(net, pkt); }
|
||||
|
||||
@Override
|
||||
public void handleUpdateTag(CompoundNBT tag) // on client
|
||||
{ read(tag); }
|
||||
|
||||
// INameable ---------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public ITextComponent getName()
|
||||
{ final Block block=getBlockState().getBlock(); return new StringTextComponent((block!=null) ? block.getTranslationKey() : "Small Waste Incinerator"); }
|
||||
|
||||
@Override
|
||||
public boolean hasCustomName()
|
||||
{ return false; }
|
||||
|
||||
@Override
|
||||
public ITextComponent getCustomName()
|
||||
{ return getName(); }
|
||||
|
||||
// IContainerProvider ----------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public ITextComponent getDisplayName()
|
||||
{ return INameable.super.getDisplayName(); }
|
||||
|
||||
@Override
|
||||
public Container createMenu(int id, PlayerInventory inventory, PlayerEntity player )
|
||||
{ return new BContainer(id, inventory, this, IWorldPosCallable.of(world, pos), fields); }
|
||||
|
||||
// IInventory ------------------------------------------------------------------------------
|
||||
|
||||
@Override
|
||||
public int getSizeInventory()
|
||||
{ return stacks_.size(); }
|
||||
|
||||
@Override
|
||||
public boolean isEmpty()
|
||||
{ for(ItemStack stack: stacks_) { if(!stack.isEmpty()) return false; } return true; }
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int index)
|
||||
{ return ((index >= 0) && (index < getSizeInventory())) ? stacks_.get(index) : ItemStack.EMPTY; }
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int index, int count)
|
||||
{ return ItemStackHelper.getAndSplit(stacks_, index, count); }
|
||||
|
||||
@Override
|
||||
public ItemStack removeStackFromSlot(int index)
|
||||
{ return ItemStackHelper.getAndRemove(stacks_, index); }
|
||||
|
||||
@Override
|
||||
public void setInventorySlotContents(int index, ItemStack stack)
|
||||
{
|
||||
if(stack.getCount() > getInventoryStackLimit()) stack.setCount(getInventoryStackLimit());
|
||||
stacks_.set(index, stack);
|
||||
markDirty();
|
||||
if(getWorld() instanceof ServerWorld) {
|
||||
// This should result in sending TE data (getUpdateTag etc) to the client for the TER.
|
||||
BlockState state = world.getBlockState(getPos());
|
||||
getWorld().notifyBlockUpdate(getPos(), state, state, 2|16|32);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit()
|
||||
{ return 64; }
|
||||
|
||||
@Override
|
||||
public void markDirty()
|
||||
{ super.markDirty(); }
|
||||
|
||||
@Override
|
||||
public boolean isUsableByPlayer(PlayerEntity player)
|
||||
{ return getPos().distanceSq(player.getPosition()) < 36; }
|
||||
|
||||
@Override
|
||||
public void openInventory(PlayerEntity player)
|
||||
{}
|
||||
|
||||
@Override
|
||||
public void closeInventory(PlayerEntity player)
|
||||
{ markDirty(); }
|
||||
|
||||
@Override
|
||||
public boolean isItemValidForSlot(int index, ItemStack stack)
|
||||
{ return (index != ITEMFRAME_SLOTNO); }
|
||||
|
||||
@Override
|
||||
public void clear()
|
||||
{ stacks_.clear(); }
|
||||
|
||||
// Fields -----------------------------------------------------------------------------------------------
|
||||
|
||||
protected final IIntArray fields = new IntArray(LabeledCrateTileEntity.NUM_OF_FIELDS)
|
||||
{
|
||||
@Override
|
||||
public int get(int id)
|
||||
{
|
||||
switch(id) {
|
||||
default: return 0;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void set(int id, int value)
|
||||
{
|
||||
switch(id) {
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// ISidedInventory ----------------------------------------------------------------------------
|
||||
|
||||
private static final int[] SIDED_INV_SLOTS;
|
||||
static {
|
||||
// that useless unoptimised language ... no proper inline conv to int[]?
|
||||
// private static final int[] SIDED_INV_SLOTS = IntStream.rangeClosed(0, BTileEntity.NUM_OF_SLOTS-2).boxed().collect(Collectors.toList()).toArray();
|
||||
SIDED_INV_SLOTS = new int[LabeledCrateTileEntity.NUM_OF_SLOTS-1];
|
||||
for(int i=0; i<SIDED_INV_SLOTS.length; ++i) SIDED_INV_SLOTS[i] = i;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getSlotsForFace(Direction side)
|
||||
{ return SIDED_INV_SLOTS; }
|
||||
|
||||
@Override
|
||||
public boolean canInsertItem(int index, ItemStack stack, Direction direction)
|
||||
{ return true; }
|
||||
|
||||
@Override
|
||||
public boolean canExtractItem(int index, ItemStack stack, Direction direction)
|
||||
{ return true; }
|
||||
|
||||
// IItemHandler --------------------------------------------------------------------------------
|
||||
|
||||
protected static class BItemHandler implements IItemHandler
|
||||
{
|
||||
private LabeledCrateTileEntity te;
|
||||
|
||||
BItemHandler(LabeledCrateTileEntity te)
|
||||
{ this.te = te; }
|
||||
|
||||
@Override
|
||||
public int getSlots()
|
||||
{ return ITEMFRAME_SLOTNO; } // iframe slot is the last
|
||||
|
||||
@Override
|
||||
public int getSlotLimit(int index)
|
||||
{ return te.getInventoryStackLimit(); }
|
||||
|
||||
@Override
|
||||
public boolean isItemValid(int slot, @Nonnull ItemStack stack)
|
||||
{ return true; }
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack insertItem(int slotno, @Nonnull ItemStack stack, boolean simulate)
|
||||
{
|
||||
if(stack.isEmpty()) return ItemStack.EMPTY;
|
||||
if((slotno < 0) || ((slotno >= NUM_OF_SLOTS)) || ((slotno == ITEMFRAME_SLOTNO)) ) return ItemStack.EMPTY;
|
||||
ItemStack slotstack = getStackInSlot(slotno);
|
||||
if(!slotstack.isEmpty()) {
|
||||
if(slotstack.getCount() >= Math.min(slotstack.getMaxStackSize(), getSlotLimit(slotno))) return stack;
|
||||
if(!ItemHandlerHelper.canItemStacksStack(stack, slotstack)) return stack;
|
||||
if(!te.canInsertItem(slotno, stack, Direction.UP) || (!te.isItemValidForSlot(slotno, stack))) return stack;
|
||||
int n = Math.min(stack.getMaxStackSize(), getSlotLimit(slotno)) - slotstack.getCount();
|
||||
if(stack.getCount() <= n) {
|
||||
if(!simulate) {
|
||||
ItemStack copy = stack.copy();
|
||||
copy.grow(slotstack.getCount());
|
||||
te.setInventorySlotContents(slotno, copy);
|
||||
}
|
||||
return ItemStack.EMPTY;
|
||||
} else {
|
||||
stack = stack.copy();
|
||||
if(!simulate) {
|
||||
ItemStack copy = stack.split(n);
|
||||
copy.grow(slotstack.getCount());
|
||||
te.setInventorySlotContents(slotno, copy);
|
||||
return stack;
|
||||
} else {
|
||||
stack.shrink(n);
|
||||
return stack;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(!te.canInsertItem(slotno, stack, Direction.UP) || (!te.isItemValidForSlot(slotno, stack))) return stack;
|
||||
int n = Math.min(stack.getMaxStackSize(), getSlotLimit(slotno));
|
||||
if(n < stack.getCount()) {
|
||||
stack = stack.copy();
|
||||
if(!simulate) {
|
||||
te.setInventorySlotContents(slotno, stack.split(n));
|
||||
return stack;
|
||||
} else {
|
||||
stack.shrink(n);
|
||||
return stack;
|
||||
}
|
||||
} else {
|
||||
if(!simulate) te.setInventorySlotContents(slotno, stack);
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack extractItem(int index, int amount, boolean simulate)
|
||||
{
|
||||
if((index < 0) || ((index >= NUM_OF_SLOTS)) || ((index == ITEMFRAME_SLOTNO)) ) return ItemStack.EMPTY;
|
||||
if(!simulate) return ItemStackHelper.getAndSplit(te.stacks_, index, amount);
|
||||
ItemStack stack = te.stacks_.get(index).copy();
|
||||
if(stack.getCount() > amount) stack.setCount(amount);
|
||||
return stack;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nonnull
|
||||
public ItemStack getStackInSlot(int index)
|
||||
{ return te.getStackInSlot(index); }
|
||||
}
|
||||
|
||||
// Capability export ----------------------------------------------------------------------------
|
||||
|
||||
protected LazyOptional<IItemHandler> item_handler_ = LazyOptional.of(() -> new LabeledCrateTileEntity.BItemHandler(this));
|
||||
|
||||
@Override
|
||||
public <T> LazyOptional<T> getCapability(net.minecraftforge.common.capabilities.Capability<T> capability, @Nullable Direction facing)
|
||||
{
|
||||
if(!this.removed) {
|
||||
if(capability==CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return item_handler_.cast();
|
||||
}
|
||||
return super.getCapability(capability, facing);
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
// GUI
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static class BGui extends ContainerScreen<BContainer>
|
||||
{
|
||||
protected final PlayerEntity player_;
|
||||
|
||||
public BGui(BContainer container, PlayerInventory player_inventory, ITextComponent title)
|
||||
{
|
||||
super(container, player_inventory, title);
|
||||
player_ = player_inventory.player;
|
||||
xSize = 213;
|
||||
ySize = 206;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init()
|
||||
{ super.init(); }
|
||||
|
||||
@Override
|
||||
public void render(int mouseX, int mouseY, float partialTicks)
|
||||
{
|
||||
renderBackground();
|
||||
super.render(mouseX, mouseY, partialTicks);
|
||||
renderHoveredToolTip(mouseX, mouseY);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY)
|
||||
{
|
||||
GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
this.minecraft.getTextureManager().bindTexture(new ResourceLocation(ModEngineersDecor.MODID, "textures/gui/labeled_crate_gui.png"));
|
||||
final int x0=guiLeft, y0=this.guiTop, w=xSize, h=ySize;
|
||||
blit(x0, y0, 0, 0, w, h);
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
// Container
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
public static class BContainer extends Container
|
||||
{
|
||||
//------------------------------------------------------------------------------------------------------------------
|
||||
protected static class StorageSlot extends Slot
|
||||
{
|
||||
StorageSlot(IInventory inventory, int index, int x, int y)
|
||||
{ super(inventory, index, x, y); }
|
||||
|
||||
@Override
|
||||
public int getSlotStackLimit()
|
||||
{ return 64; }
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------------
|
||||
private static final int PLAYER_INV_START_SLOTNO = LabeledCrateTileEntity.NUM_OF_SLOTS;
|
||||
protected final PlayerEntity player_;
|
||||
protected final IInventory inventory_;
|
||||
protected final IWorldPosCallable wpc_;
|
||||
private final IIntArray fields_;
|
||||
private int proc_time_needed_;
|
||||
//------------------------------------------------------------------------------------------------------------------
|
||||
public int field(int index) { return fields_.get(index); }
|
||||
public PlayerEntity player() { return player_ ; }
|
||||
public IInventory inventory() { return inventory_ ; }
|
||||
public World world() { return player_.world; }
|
||||
//------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
public BContainer(int cid, PlayerInventory player_inventory)
|
||||
{ this(cid, player_inventory, new Inventory(LabeledCrateTileEntity.NUM_OF_SLOTS), IWorldPosCallable.DUMMY, new IntArray(LabeledCrateTileEntity.NUM_OF_FIELDS)); }
|
||||
|
||||
private BContainer(int cid, PlayerInventory player_inventory, IInventory block_inventory, IWorldPosCallable wpc, IIntArray fields)
|
||||
{
|
||||
super(ModContent.CT_LABELED_CRATE, cid);
|
||||
player_ = player_inventory.player;
|
||||
inventory_ = block_inventory;
|
||||
wpc_ = wpc;
|
||||
fields_ = fields;
|
||||
int i=-1;
|
||||
// storage slots (stacks 0 to 53)
|
||||
for(int y=0; y<6; ++y) {
|
||||
for(int x=0; x<9; ++x) {
|
||||
int xpos = 28+x*18, ypos = 10+y*18;
|
||||
addSlot(new StorageSlot(inventory_, ++i, xpos, ypos));
|
||||
}
|
||||
}
|
||||
// picture frame slot (54)
|
||||
addSlot(new Slot(inventory_, ++i, 191, 100) {
|
||||
@Override public int getSlotStackLimit(){return 1;}
|
||||
});
|
||||
// player slots
|
||||
for(int x=0; x<9; ++x) {
|
||||
addSlot(new Slot(player_inventory, x, 28+x*18, 183)); // player slots: 0..8
|
||||
}
|
||||
for(int y=0; y<3; ++y) {
|
||||
for(int x=0; x<9; ++x) {
|
||||
addSlot(new Slot(player_inventory, x+y*9+9, 28+x*18, 125+y*18)); // player slots: 9..35
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(PlayerEntity player)
|
||||
{ return inventory_.isUsableByPlayer(player); }
|
||||
|
||||
@Override
|
||||
public boolean canMergeSlot(ItemStack stack, Slot slot)
|
||||
{ return (slot.getSlotStackLimit() > 1); }
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(PlayerEntity player)
|
||||
{ super.onContainerClosed(player); }
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(PlayerEntity player, int index)
|
||||
{
|
||||
Slot slot = getSlot(index);
|
||||
if((slot==null) || (!slot.getHasStack())) return ItemStack.EMPTY;
|
||||
ItemStack slot_stack = slot.getStack();
|
||||
ItemStack transferred = slot_stack.copy();
|
||||
if((index>=0) && (index<PLAYER_INV_START_SLOTNO)) {
|
||||
// Crate slots
|
||||
if(!mergeItemStack(slot_stack, PLAYER_INV_START_SLOTNO, PLAYER_INV_START_SLOTNO+36, false)) return ItemStack.EMPTY;
|
||||
} else if((index >= PLAYER_INV_START_SLOTNO) && (index <= PLAYER_INV_START_SLOTNO+36)) {
|
||||
// Player slot
|
||||
if(!mergeItemStack(slot_stack, 0, PLAYER_INV_START_SLOTNO-1, false)) return ItemStack.EMPTY;
|
||||
} else {
|
||||
// invalid slot
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
if(slot_stack.isEmpty()) {
|
||||
slot.putStack(ItemStack.EMPTY);
|
||||
} else {
|
||||
slot.onSlotChanged();
|
||||
}
|
||||
if(slot_stack.getCount() == transferred.getCount()) return ItemStack.EMPTY;
|
||||
slot.onTake(player, slot_stack);
|
||||
return transferred;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -27,6 +27,7 @@ import net.minecraftforge.api.distmarker.Dist;
|
|||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
import wile.engineersdecor.blocks.BlockDecorCraftingTable.CraftingTableBlock;
|
||||
import wile.engineersdecor.blocks.BlockDecorLabeledCrate;
|
||||
|
||||
|
||||
public class ModRenderers
|
||||
|
|
@ -106,14 +107,62 @@ public class ModRenderers
|
|||
mxs.translate(rndo, rndo, 0);
|
||||
mxs.scale(scaler, scaler, scaler);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType.FIXED, i5, i6, mxs, buf);
|
||||
mxs.pop(); // mxs.pop()
|
||||
mxs.pop();
|
||||
}
|
||||
} catch(Throwable e) {
|
||||
if(--tesr_error_counter<=0) {
|
||||
ModEngineersDecor.logger().error("TESR was disabled because broken, exception was: " + e.getMessage());
|
||||
ModEngineersDecor.logger().error("TER was disabled because broken, exception was: " + e.getMessage());
|
||||
ModEngineersDecor.logger().error(e.getStackTrace());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
// Labeled Crate
|
||||
//--------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public static class DecorLabeledCrateTer extends TileEntityRenderer<BlockDecorLabeledCrate.LabeledCrateTileEntity>
|
||||
{
|
||||
private static int tesr_error_counter = 4;
|
||||
private static float scaler = 0.35f;
|
||||
double tr[][]= { // [hdirection=S-W-N-E][param]
|
||||
{ +8.0/32, -8.0/32, +15.5/32, 180.0 }, // N
|
||||
{ -15.5/32, -8.0/32, +8.0/32, 90.0 }, // E
|
||||
{ -8.0/32, -8.0/32, -15.5/32, 0.0 }, // S param=tx,ty,tz,ry
|
||||
{ +15.5/32, -8.0/32, -8.0/32, 270.0 }, // W
|
||||
};
|
||||
|
||||
public DecorLabeledCrateTer(TileEntityRendererDispatcher dispatcher)
|
||||
{ super(dispatcher); }
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("deprecation")
|
||||
public void render(final BlockDecorLabeledCrate.LabeledCrateTileEntity te, float unused1, MatrixStack mxs, IRenderTypeBuffer buf, int i5, int i6)
|
||||
{
|
||||
if(tesr_error_counter<=0) return;
|
||||
try {
|
||||
final ItemStack stack = te.getItemFrameStack();
|
||||
if(stack.isEmpty()) return;
|
||||
final int di = MathHelper.clamp(te.getWorld().getBlockState(te.getPos()).get(BlockDecorLabeledCrate.DecorLabeledCrateBlock.HORIZONTAL_FACING).getHorizontalIndex(), 0, 3);
|
||||
double ox = tr[di][0], oy = tr[di][1], oz = tr[di][2];
|
||||
float ry = (float)tr[di][3];
|
||||
mxs.push();
|
||||
//GlStateManager.disableLighting();
|
||||
//RenderHelper.enableStandardItemLighting();
|
||||
mxs.translate(0.5+ox, 0.5+oy, 0.5+oz);
|
||||
mxs.rotate(Vector3f.YP.rotationDegrees(ry));
|
||||
mxs.scale(scaler, scaler, scaler);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType.FIXED, i5, i6, mxs, buf);
|
||||
//RenderHelper.disableStandardItemLighting();
|
||||
//GlStateManager.enableLighting();
|
||||
mxs.pop();
|
||||
} catch(Throwable e) {
|
||||
if(--tesr_error_counter<=0) {
|
||||
ModEngineersDecor.logger().error("TER was disabled (because broken), exception was: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north": { "model": "engineersdecor:block/misc/labeled_crate_model" },
|
||||
"facing=south": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":180 },
|
||||
"facing=west": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":270 },
|
||||
"facing=east": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":90 }
|
||||
}
|
||||
}
|
||||
|
|
@ -135,6 +135,8 @@
|
|||
"block.engineersdecor.treated_wood_stool.help": "§6Robust Wood Stool.§r Indoor and outdoor use.",
|
||||
"block.engineersdecor.treated_wood_crafting_table": "Treated Wood Crafting Table",
|
||||
"block.engineersdecor.treated_wood_crafting_table.help": "§6Robust and weather-proof.§r Eight storage slots, keeps inventory, no vanilla recipe book.\n Click up/down arrow buttons for crafting history selection, output slot for item placement, X-button to clear crafting grid and history. Shift-click stack: player-to-storage stack transfer when crafting grid empty, otherwise player-to-grid stack transfer. Automatically distributes the clicked stack. Shift-Ctrl-click stack: Move all same stacks. Mouse wheel over crafting slot: Increase/decrease crafting grid items.",
|
||||
"block.engineersdecor.labeled_crate": "Labeled Crate",
|
||||
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
|
||||
"block.engineersdecor.treated_wood_side_table": "Treated Wood Side Table",
|
||||
"block.engineersdecor.treated_wood_side_table.help": "§6Needed after the work's done.",
|
||||
"block.engineersdecor.iron_inset_light": "Inset Light",
|
||||
|
|
|
|||
|
|
@ -135,6 +135,8 @@
|
|||
"block.engineersdecor.treated_wood_stool.help": "§6Крепкий деревянный табурет.§r Для использования в помещении и на улице.",
|
||||
"block.engineersdecor.treated_wood_crafting_table": "Верстак из обработанного дерева",
|
||||
"block.engineersdecor.treated_wood_crafting_table.help": "§6Прочный и устойчивый к погодным условиям. Восемь слотов для хранения. Хранит инвентарь. Нажимайте кнопки со стрелками вверх/вниз для выбора из истории, выходной слот для размещения предметов, X-кнопка очистить сетку крафта и историю. Shift-клик по стеку: передача стека от игрока в хранилище при создании если сетка пуста, в противном случае перенос от игрока в сетку. Автоматически распределяет кликаемый стек. Shift-Ctrl-клик по стаку: перемещает одинаковые стаки. Колёсико мыши: добавляет/отнимает предметы в сетке.",
|
||||
"block.engineersdecor.labeled_crate": "Labeled Crate",
|
||||
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
|
||||
"block.engineersdecor.treated_wood_side_table": "Столик из обработанного дерева",
|
||||
"block.engineersdecor.treated_wood_side_table.help": "§6Нужен после того, как работа выполнена.",
|
||||
"block.engineersdecor.iron_inset_light": "Встраиваемый осветитель",
|
||||
|
|
|
|||
|
|
@ -135,6 +135,8 @@
|
|||
"block.engineersdecor.treated_wood_stool.help": "§6坚固的木凳。§r适用于室内和室外使用。",
|
||||
"block.engineersdecor.treated_wood_crafting_table": "防腐木合成台",
|
||||
"block.engineersdecor.treated_wood_crafting_table.help": "§6坚固，防风防雨。§r内含八个存储格，破坏后保留内容物，没有原版合成书。\n 单击上/下箭头按钮可选择合成历史，单击输出格自动放置物品，单击X按钮 清除合成栏和历史。Shift单击一叠物品：合成格空时转移到存储格， 非空时到合成栏。会自动分配转移的物品。",
|
||||
"block.engineersdecor.labeled_crate": "Labeled Crate",
|
||||
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
|
||||
"block.engineersdecor.treated_wood_side_table": "防腐木茶几",
|
||||
"block.engineersdecor.treated_wood_side_table.help": "§6干完活后需要喝杯茶。",
|
||||
"block.engineersdecor.iron_inset_light": "嵌入灯",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
{
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"f": "engineersdecor:block/misc/labeled_crate_front_texture",
|
||||
"particle": "engineersdecor:block/misc/labeled_crate_side_texture",
|
||||
"s": "engineersdecor:block/misc/labeled_crate_side_texture"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 7, 0],
|
||||
"to": [16, 16, 0.25],
|
||||
"faces": {
|
||||
"north": {"texture": "#f"},
|
||||
"east": {"texture": "#s"},
|
||||
"west": {"texture": "#s"},
|
||||
"up": {"texture": "#s"},
|
||||
"down": {"texture": "#s"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 0, 0.25],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"texture": "#f"},
|
||||
"east": {"texture": "#s"},
|
||||
"south": {"texture": "#s"},
|
||||
"west": {"texture": "#s"},
|
||||
"up": {"texture": "#s"},
|
||||
"down": {"texture": "#s"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 0, 0],
|
||||
"to": [16, 7, 0.25],
|
||||
"faces": {
|
||||
"north": {"texture": "#f"},
|
||||
"east": {"texture": "#s"},
|
||||
"south": {"texture": "#s"},
|
||||
"west": {"texture": "#s"},
|
||||
"down": {"texture": "#s"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 0, 0],
|
||||
"to": [1, 7, 0.375],
|
||||
"faces": {
|
||||
"north": {"texture": "#f"},
|
||||
"east": {"texture": "#s"},
|
||||
"south": {"texture": "#s"},
|
||||
"west": {"texture": "#s"},
|
||||
"down": {"texture": "#s"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 0, 0],
|
||||
"to": [7, 1, 0.25],
|
||||
"faces": {
|
||||
"north": {"texture": "#f"},
|
||||
"up": {"texture": "#s"},
|
||||
"down": {"texture": "#s"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"ground": {
|
||||
"translation": [0, 1.75, 0],
|
||||
"scale": [0.2, 0.2, 0.2]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 225, 0],
|
||||
"scale": [0.625, 0.625, 0.625]
|
||||
},
|
||||
"fixed": {
|
||||
"scale": [0.5, 0.5, 0.5]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{ "parent": "engineersdecor:block/misc/labeled_crate_model" }
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 662 B |
Binary file not shown.
|
After Width: | Height: | Size: 672 B |
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -0,0 +1,58 @@
|
|||
{
|
||||
"type": "forge:conditional",
|
||||
"recipes": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:optional",
|
||||
"result": "engineersdecor:labeled_crate",
|
||||
"required": ["#forge:rods/iron", "immersiveengineering:crate"]
|
||||
}
|
||||
],
|
||||
"recipe": {
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"RCR",
|
||||
"CFC",
|
||||
"RCR"
|
||||
],
|
||||
"key": {
|
||||
"R": { "tag" : "forge:rods/iron"},
|
||||
"C": { "item": "immersiveengineering:crate"},
|
||||
"F": { "item": "minecraft:item_frame"}
|
||||
},
|
||||
"result": {
|
||||
"item": "engineersdecor:labeled_crate",
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:optional",
|
||||
"result": "engineersdecor:labeled_crate",
|
||||
"required": ["#forge:chests/wooden"],
|
||||
"missing": ["#forge:rods/iron", "immersiveengineering:crate"]
|
||||
}
|
||||
],
|
||||
"recipe": {
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"RCR",
|
||||
"CFC",
|
||||
"RCR"
|
||||
],
|
||||
"key": {
|
||||
"R": { "item": "minecraft:iron_nugget"},
|
||||
"C": { "tag": "forge:chests/wooden"},
|
||||
"F": { "item": "minecraft:item_frame"}
|
||||
},
|
||||
"result": {
|
||||
"item": "engineersdecor:labeled_crate",
|
||||
"count": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue