MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Steel mesh fence added, Broad Windowsill added, Tree Cutter can chop DyncmicTrees (issue #52).

Browse source
This commit is contained in:
stfwi 2019-10-05 14:13:08 +02:00
parent 1eeaa1229e
commit 1b0a84ae7f
119 changed files with 3399 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

53
.gitignore vendored
View file

@ -1,33 +1,36 @@
bin
*.launch
.settings
.metadata
.classpath
.gimp
.gradle
.idea
.metadata
.project
out
.settings
.vscode
.DS_Store
*~
*.iml
*.ipr
*.iws
*.iml
.idea
build
.gradle
*.tmp
*.log
*.jks
eclipse
run
tests
/dist
signing.*
src/main/java/archive
src/main/resources/assets/minecraft
.vscode
/classes
/dev
/tmp
*.launch
*.log
*.tmp
*.xcf
/*.txt
/archive
/assets-src
.gimp
*.xcf
/classes
/dev
/dist
/tmp
bin
build
desktop.ini
/*.txt
eclipse
out
run
signing.*
/*/src/generated
/*/src/main/java/archive
/*/src/main/resources/assets/minecraft
/*/tests

2
1.12/gradle.properties
View file

@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G
version_minecraft=1.12.2
version_forge=14.23.5.2768
version_jei=4.10.0.198
version_engineersdecor=1.0.13-b1
version_engineersdecor=1.0.13-b2

5
1.12/meta/update.json
View file

@ -1,7 +1,8 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": {
"1.0.13-b1": "[A] Small Solar Panel added.\n[A] Small Tree Cutter added.",
"1.0.13-b2": "[A] Added Steel Mesh Fence.\n[A] Added Broad Window Sill.\n[A] Small Tree Cutter can chop Dynamic Trees, chops at tree trunk radius 7 or higher.",
"1.0.13-b1": "[A] Added Small Solar Panel.\n[A] Added Small Tree Cutter.",
"1.0.12": "[R] Release based on v1.0.12-b2. Release-to-release changes: * Crafting table: Recipe collision resolver added. Items are rendered on the table surface. * Small Mineral Smelter released. * Factory Dropper: Continuous dropping mode added. * Block opacity fixes, window model fixes. * Lang file updates.",
"1.0.12-b2": "[A] Crafting Table: Added recipe collision resolver, also applies to crafting history refabrication.\n[A] Crafting Table: Added rendering of placed items on the top surface of the table.\n[M] Lang files updated.",
"1.0.12-b1": "[A] Mineal Smelter non-experimental now.\n[M] Window submodels stripped (reopened issue #19, thx overchoice).\n[M] Opaque full block light opacity fixed (issue #50, thx Illomiurge).\n[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51, thx Aristine for the CR).",
@ -59,6 +60,6 @@
},
"promos": {
"1.12.2-recommended": "1.0.12",
"1.12.2-latest": "1.0.13-b1"
"1.12.2-latest": "1.0.13-b2"
}
}

9
1.12/readme.md
View file

@ -10,8 +10,13 @@ Mod sources for Minecraft version 1.12.2.
----
## Version history
- v1.0.13-b1 [A] Small Solar Panel added.
[A] Small Tree Cutter added.
- v1.0.13-b2 [A] Added Steel Mesh Fence.
[A] Added Broad Window Sill.
[A] Small Tree Cutter can chop Dynamic Trees,
chops at tree trunk radius 7 or higher.
- v1.0.13-b1 [A] Added Small Solar Panel.
[A] Added Small Tree Cutter.
-------------------------------------------------------------------
- v1.0.12 [R] Release based on v1.0.12-b2. Release-to-release changes:

21
1.12/src/main/java/wile/engineersdecor/ModContent.java
View file

@ -26,7 +26,6 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -229,6 +228,13 @@ public class ModContent
//--------------------------------------------------------------------------------------------------------------------
public static final BlockDecorFence STEEL_MESH_FENCE = new BlockDecorFence(
"steel_mesh_fence",
BlockDecor.CFG_DEFAULT, Material.IRON, 2f, 15f, SoundType.METAL
);
//--------------------------------------------------------------------------------------------------------------------
public static final BlockDecor TREATED_WOOD_TABLE = new BlockDecor(
"treated_wood_table",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
@ -250,13 +256,20 @@ public class ModContent
ModAuxiliaries.getPixeledAABB(2,0,2, 14,15.9,14)
);
public static final BlockDecorDirected TREATED_WOOD_WINDOWSILL = new BlockDecorDirected(
public static final BlockDecorWindowSill TREATED_WOOD_WINDOWSILL = new BlockDecorWindowSill(
"treated_wood_windowsill",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT,
Material.WOOD, 1.0f, 10f, SoundType.WOOD,
ModAuxiliaries.getPixeledAABB(0.5,15,10.5, 15.5,16,16)
);
public static final BlockDecorWindowSill TREATED_WOOD_BROAD_WINDOWSILL = new BlockDecorWindowSill(
"treated_wood_broad_windowsill",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT,
Material.WOOD, 1.0f, 10f, SoundType.WOOD,
ModAuxiliaries.getPixeledAABB(0,14.5,4, 16,16,16)
);
public static final BlockDecorDirected INSET_LIGHT_IRON = new BlockDecorDirected(
"iron_inset_light",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(14<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
@ -491,6 +504,7 @@ public class ModContent
TREATED_WOOD_WINDOW,
STEEL_FRAMED_WINDOW,
TREATED_WOOD_WINDOWSILL,
TREATED_WOOD_BROAD_WINDOWSILL,
INSET_LIGHT_IRON,
TREATED_WOOD_POLE_SUPPORT,
TREATED_WOOD_POLE_HEAD,
@ -500,6 +514,7 @@ public class ModContent
THICK_STEEL_POLE_HEAD,
STEEL_DOUBLE_T_SUPPORT,
STEEL_FLOOR_GRATING,
STEEL_MESH_FENCE,
SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_EXIT, SIGN_MODLOGO,
TREATED_WOOD_SIDE_TABLE,
HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, HALFSLAB_TREATEDWOOD,
@ -563,7 +578,7 @@ public class ModContent
public static final void registerBlocks(RegistryEvent.Register<Block> event)
{
// Config based registry selection
final boolean ie_installed = Loader.isModLoaded("immersiveengineering");
final boolean ie_installed = ModAuxiliaries.isModLoaded("immersiveengineering");
int num_block_registrations_skipped = 0;
int num_block_registrations_skipped_noie = 0;
final boolean woor = ModConfig.isWithoutOptOutRegistration();

1
1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java
View file

@ -116,6 +116,7 @@ public class ModEngineersDecor
if(RecipeCondModSpecific.num_skipped > 0) logger.info("Excluded " + RecipeCondModSpecific.num_skipped + " recipes due to config opt-out.");
if(ModConfig.zmisc.with_experimental) logger.info("Included experimental features due to mod config.");
ExtItems.onPostInit();
TreeCutting.reload();
}
@Mod.EventBusSubscriber

75
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFence.java Normal file
View file

@ -0,0 +1,75 @@
/*
* @file BlockDecorFence.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2019 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Fence blocks.
*/
package wile.engineersdecor.blocks;
import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public class BlockDecorFence extends BlockDecorWall
{
protected static final AxisAlignedBB[] AABB_BY_INDEX = mkAABBs (1.5d, 0.5d, 16d);
protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = mkAABBs (1.5d, 0.5d, 24d);
protected static final AxisAlignedBB[][] AABB_LIST_BY_INDEX = mkCAABBs(1.5d, 0.5d, 16d);
protected static final AxisAlignedBB[][] CLIP_AABB_LIST_BY_INDEX = mkCAABBs(1.5d, 0.5d, 24d);
public BlockDecorFence(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
{
super(registryName, config, material, hardness, resistance, sound);
setDefaultState(blockState.getBaseState().withProperty(UP, false).withProperty(NORTH, false).withProperty(EAST, false).withProperty(SOUTH, false).withProperty(WEST, false));
}
@Override
public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos)
{ return AABB_BY_INDEX[getAABBIndex(getActualState(state, source, pos))]; }
@Override
@SuppressWarnings("deprecation")
public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean isActualState)
{
final AxisAlignedBB[] bbs = CLIP_AABB_LIST_BY_INDEX[getAABBIndex(isActualState ? state : getActualState(state, world, pos))];
for(int i=0; i<bbs.length;++i) addCollisionBoxToList(pos, entityBox, collidingBoxes, bbs[i]);
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{ return CLIP_AABB_BY_INDEX[getAABBIndex(getActualState(state, world, pos))]; }
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face)
{ return (face==EnumFacing.UP) ? (BlockFaceShape.SOLID) : ((face!=EnumFacing.DOWN) ? (BlockFaceShape.MIDDLE_POLE_THIN) : (BlockFaceShape.CENTER_SMALL)); }
@Override
protected BlockStateContainer createBlockState()
{ return new BlockStateContainer(this, new IProperty[] {UP, NORTH, EAST, WEST, SOUTH}); }
@Override
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos)
{
boolean n = canWallConnectTo(world, pos, EnumFacing.NORTH);
boolean e = canWallConnectTo(world, pos, EnumFacing.EAST);
boolean s = canWallConnectTo(world, pos, EnumFacing.SOUTH);
boolean w = canWallConnectTo(world, pos, EnumFacing.WEST);
boolean nopole = (n && s && !e && !w) || (!n && !s && e && w);
return state.withProperty(UP,!nopole).withProperty(NORTH, n).withProperty(EAST, e).withProperty(SOUTH, s).withProperty(WEST, w);
}
}

124
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java
View file

@ -8,6 +8,7 @@
*/
package wile.engineersdecor.blocks;
import wile.engineersdecor.detail.ModAuxiliaries;
import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@ -18,6 +19,7 @@ import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.pathfinding.PathNodeType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
@ -25,6 +27,7 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
@ -44,32 +47,72 @@ public class BlockDecorWall extends BlockDecor
public static final PropertyBool WEST = BlockWall.WEST;
public static final PropertyInteger TEXTURE_VARIANT = PropertyInteger.create("tvariant", 0, 7);
private static final double d_0 = 0.0d;
private static final double d_1 = 1.0d;
private static final double d_a = 0.25d;
private static final double d_b = 1.0d-d_a;
private static final double d_k = 0.26d; // 0.3125D;
private static final double d_l = 1.0d-d_k;
protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[] {
new AxisAlignedBB(d_a, d_0, d_a, d_b, d_1, d_b),
new AxisAlignedBB(d_a, d_0, d_a, d_b, d_1, d_1),
new AxisAlignedBB(d_0, d_0, d_a, d_b, d_1, d_b),
new AxisAlignedBB(d_0, d_0, d_a, d_b, d_1, d_1),
new AxisAlignedBB(d_a, d_0, d_0, d_b, d_1, d_b),
new AxisAlignedBB(d_k, d_0, d_0, d_l, d_1, d_1),
new AxisAlignedBB(d_0, d_0, d_0, d_b, d_1, d_b),
new AxisAlignedBB(d_0, d_0, d_0, d_b, d_1, d_1),
new AxisAlignedBB(d_a, d_0, d_a, d_1, d_1, d_b),
new AxisAlignedBB(d_a, d_0, d_a, d_1, d_1, d_1),
new AxisAlignedBB(d_0, d_0, d_k, d_1, d_1, d_l),
new AxisAlignedBB(d_0, d_0, d_a, d_1, d_1, d_1),
new AxisAlignedBB(d_a, d_0, d_0, d_1, d_1, d_b),
new AxisAlignedBB(d_a, d_0, d_0, d_1, d_1, d_1),
new AxisAlignedBB(d_0, d_0, d_0, d_1, d_1, d_b),
new AxisAlignedBB(d_0, d_0, d_0, d_1, d_1, d_1)
protected static final AxisAlignedBB[] mkAABBs(double pole_thickness_px, double wall_thickness_px, double height_px)
{
final double d_0 = 0.0d;
final double d_1 = 16.0d;
final double d_a = (8d-pole_thickness_px);
final double d_b = 16.0d-d_a;
final double d_k = (8d-wall_thickness_px);
final double d_l = 16.0d-d_k;
return new AxisAlignedBB[] { // ENWS P
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_a, d_b, height_px, d_b), // 0000 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_a, d_b, height_px, d_1), // 0001 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_a, d_b, height_px, d_b), // 0010 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_a, d_b, height_px, d_1), // 0011 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_0, d_b, height_px, d_b), // 0100 1
ModAuxiliaries.getPixeledAABB(d_k, d_0, d_0, d_l, height_px, d_1), // 0101 0
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_0, d_b, height_px, d_b), // 0110 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_0, d_b, height_px, d_1), // 0111 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_a, d_1, height_px, d_b), // 1000 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_a, d_1, height_px, d_1), // 1001 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_k, d_1, height_px, d_l), // 1010 0
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_a, d_1, height_px, d_1), // 1011 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_0, d_1, height_px, d_b), // 1100 1
ModAuxiliaries.getPixeledAABB(d_a, d_0, d_0, d_1, height_px, d_1), // 1101 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_0, d_1, height_px, d_b), // 1110 1
ModAuxiliaries.getPixeledAABB(d_0, d_0, d_0, d_1, height_px, d_1) // 1111 1
};
private static final double clip_height = 1.8d;
protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[] { AABB_BY_INDEX[0].setMaxY(clip_height), AABB_BY_INDEX[1].setMaxY(clip_height), AABB_BY_INDEX[2].setMaxY(clip_height), AABB_BY_INDEX[3].setMaxY(clip_height), AABB_BY_INDEX[4].setMaxY(clip_height), AABB_BY_INDEX[5].setMaxY(clip_height), AABB_BY_INDEX[6].setMaxY(clip_height), AABB_BY_INDEX[7].setMaxY(clip_height), AABB_BY_INDEX[8].setMaxY(clip_height), AABB_BY_INDEX[9].setMaxY(clip_height), AABB_BY_INDEX[10].setMaxY(clip_height), AABB_BY_INDEX[11].setMaxY(clip_height), AABB_BY_INDEX[12].setMaxY(clip_height), AABB_BY_INDEX[13].setMaxY(clip_height), AABB_BY_INDEX[14].setMaxY(clip_height), AABB_BY_INDEX[15].setMaxY(clip_height) };
}
protected static final AxisAlignedBB[][] mkCAABBs(double pole_thickness_px, double wall_thickness_px, double height_px)
{
final double d_0 = 0.0d;
final double d_1 = 16.0d;
final double d_a = (8d-pole_thickness_px);
final double d_b = 16.0d-d_a;
final double d_k = (8d-wall_thickness_px);
final double d_l = 16.0d-d_k;
final AxisAlignedBB bb_p = ModAuxiliaries.getPixeledAABB(d_a, d_0, d_a, d_b, height_px, d_b); // 0000
final AxisAlignedBB bb_s = ModAuxiliaries.getPixeledAABB(d_k, d_0, d_k, d_l, height_px, d_1); // 0001
final AxisAlignedBB bb_w = ModAuxiliaries.getPixeledAABB(d_0, d_0, d_k, d_l, height_px, d_l); // 0010
final AxisAlignedBB bb_n = ModAuxiliaries.getPixeledAABB(d_k, d_0, d_0, d_l, height_px, d_l); // 0100
final AxisAlignedBB bb_e = ModAuxiliaries.getPixeledAABB(d_k, d_0, d_k, d_1, height_px, d_l); // 1000
return new AxisAlignedBB[][] { // ENWS P
new AxisAlignedBB[]{ bb_p }, // 0000 1
new AxisAlignedBB[]{ bb_s }, // 0001 1
new AxisAlignedBB[]{ bb_w }, // 0010 1
new AxisAlignedBB[]{ bb_s,bb_w }, // 0011 1
new AxisAlignedBB[]{ bb_n }, // 0100 1
new AxisAlignedBB[]{ bb_n,bb_s }, // 0101 0
new AxisAlignedBB[]{ bb_n,bb_w }, // 0110 1
new AxisAlignedBB[]{ bb_n,bb_w,bb_s }, // 0111 1
new AxisAlignedBB[]{ bb_e }, // 1000 1
new AxisAlignedBB[]{ bb_e,bb_s }, // 1001 1
new AxisAlignedBB[]{ bb_e,bb_w }, // 1010 0
new AxisAlignedBB[]{ bb_e,bb_w,bb_s }, // 1011 1
new AxisAlignedBB[]{ bb_e,bb_n }, // 1100 1
new AxisAlignedBB[]{ bb_e,bb_n,bb_s }, // 1101 1
new AxisAlignedBB[]{ bb_e,bb_n,bb_w }, // 1110 1
new AxisAlignedBB[]{ bb_e,bb_n,bb_w,bb_s } // 1111 1
};
}
protected static final AxisAlignedBB[] AABB_BY_INDEX = mkAABBs(4d, 3.84, 16d);
protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = mkAABBs(4d, 3.84, 24d);
protected static final AxisAlignedBB[][] AABB_LIST_BY_INDEX = mkCAABBs(4d, 3.84, 16d);
protected static final AxisAlignedBB[][] CLIP_AABB_LIST_BY_INDEX = mkCAABBs(4d, 3.84, 24d);
protected static final AxisAlignedBB SELECTION_AABB = ModAuxiliaries.getPixeledAABB(0, 0, 0, 0.01, 0.01, 0.01);
public BlockDecorWall(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound)
{
@ -84,18 +127,27 @@ public class BlockDecorWall extends BlockDecor
@Override
@SuppressWarnings("deprecation")
public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entityIn, boolean isActualState)
{ addCollisionBoxToList(pos, entityBox, collidingBoxes, CLIP_AABB_BY_INDEX[getAABBIndex(isActualState ? state : getActualState(state, world, pos))]); }
{
final AxisAlignedBB[] bbs = CLIP_AABB_LIST_BY_INDEX[getAABBIndex(isActualState ? state : getActualState(state, world, pos))];
for(int i=0; i<bbs.length;++i) addCollisionBoxToList(pos, entityBox, collidingBoxes, bbs[i]);
}
@Nullable
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos)
{ return CLIP_AABB_BY_INDEX[getAABBIndex(getActualState(state, world, pos))]; }
private static int getAABBIndex(IBlockState state)
{ return ((!(state.getValue(NORTH))) ? 0 : (1<<EnumFacing.NORTH.getHorizontalIndex()))
| ((!(state.getValue( EAST))) ? 0 : (1<<EnumFacing.EAST.getHorizontalIndex()))
| ((!(state.getValue(SOUTH))) ? 0 : (1<<EnumFacing.SOUTH.getHorizontalIndex()))
| ((!(state.getValue( WEST))) ? 0 : (1<<EnumFacing.WEST.getHorizontalIndex()));
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("deprecation")
public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World world, BlockPos pos)
{ return SELECTION_AABB; }
protected static int getAABBIndex(IBlockState state)
{ return ((!(state.getValue(SOUTH))) ? 0 : (1<<EnumFacing.SOUTH.getHorizontalIndex())) // 0
| ((!(state.getValue( WEST))) ? 0 : (1<<EnumFacing.WEST.getHorizontalIndex())) // 1
| ((!(state.getValue(NORTH))) ? 0 : (1<<EnumFacing.NORTH.getHorizontalIndex())) // 2
| ((!(state.getValue( EAST))) ? 0 : (1<<EnumFacing.EAST.getHorizontalIndex())); // 3
}
@Override
@ -122,11 +174,11 @@ public class BlockDecorWall extends BlockDecor
public boolean canSpawnInBlock()
{ return false; }
private boolean canConnectTo(IBlockAccess world, BlockPos pos, BlockPos other, EnumFacing facing)
protected boolean canConnectTo(IBlockAccess world, BlockPos pos, BlockPos other, EnumFacing facing)
{
final IBlockState state = world.getBlockState(other);
final Block block = state.getBlock();
if((block instanceof BlockDecorWall) || (block instanceof BlockFenceGate)) return true;
if((block instanceof BlockDecorWall) || (block instanceof BlockFenceGate) || (block instanceof BlockDecorFence)) return true;
if(world.getBlockState(pos.offset(facing)).getBlock()!=this) return false;
if(block instanceof BlockFence) return true;
final BlockFaceShape shp = state.getBlockFaceShape(world, other, facing);
@ -173,11 +225,15 @@ public class BlockDecorWall extends BlockDecor
public boolean canBeConnectedTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
{ return canConnectTo(world, pos, pos.offset(facing), facing.getOpposite()); }
private boolean canWallConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
protected boolean canWallConnectTo(IBlockAccess world, BlockPos pos, EnumFacing facing)
{ return canConnectTo(world, pos, pos.offset(facing), facing.getOpposite()); }
@Override
public boolean canPlaceTorchOnTop(IBlockState state, IBlockAccess world, BlockPos pos)
{ return true; }
@Override
public net.minecraft.pathfinding.PathNodeType getAiPathNodeType(IBlockState state, IBlockAccess world, BlockPos pos)
{ return PathNodeType.FENCE; }
}

43
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindowSill.java Normal file
View file

@ -0,0 +1,43 @@
/*
* @file BlockDecorWindowSill.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2019 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Block for windowsills to allow placing things on top
* (top side solid).
*/
package wile.engineersdecor.blocks;
import net.minecraft.block.material.Material;
import net.minecraft.block.SoundType;
import net.minecraft.block.state.BlockFaceShape;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class BlockDecorWindowSill extends BlockDecorDirected
{
public BlockDecorWindowSill(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB unrotatedAABB)
{ super(registryName, config|CFG_HORIZIONTAL, material, hardness, resistance, sound, unrotatedAABB); }
@Override
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face)
{ return (face==EnumFacing.UP) ? BlockFaceShape.SOLID : BlockFaceShape.UNDEFINED; }
@Override
@SuppressWarnings("deprecation")
public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)
{ return side==EnumFacing.UP; }
@Override
@SuppressWarnings("deprecation")
public boolean isTopSolid(IBlockState state)
{ return true; }
}

4
1.12/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java
View file

@ -9,6 +9,7 @@
package wile.engineersdecor.detail;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.common.Loader;
import wile.engineersdecor.ModEngineersDecor;
import net.minecraft.world.World;
import net.minecraft.item.ItemStack;
@ -154,6 +155,9 @@ public class ModAuxiliaries
if(!s.isEmpty()) player.sendMessage(new TextComponentTranslation(s));
}
public static boolean isModLoaded(String id)
{ return Loader.isModLoaded(id); }
@SuppressWarnings("unused")
public interface IExperimentalFeature{}
}

82
1.12/src/main/java/wile/engineersdecor/detail/TreeCutting.java
View file

@ -8,25 +8,100 @@
*/
package wile.engineersdecor.detail;
import com.google.common.collect.ImmutableList;
import wile.engineersdecor.ModEngineersDecor;
import net.minecraft.init.Blocks;
import net.minecraft.block.Block;
import net.minecraft.block.BlockVine;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import com.google.common.collect.ImmutableList;
import java.util.*;
public class TreeCutting
{
private static org.apache.logging.log4j.Logger LOGGER = ModEngineersDecor.logger;
private static class Compat
{
enum ChoppingMethod { None, RootBlockBreaking }
private static final HashMap<IBlockState, ChoppingMethod> choppable_states = new HashMap<IBlockState, ChoppingMethod>();
public static long num_breaking_exceptions = 0;
static void reload()
{
try {
choppable_states.clear();
if(ModAuxiliaries.isModLoaded("dynamictrees")) {
ForgeRegistries.BLOCKS.getKeys().forEach((regname)->{
if("dynamictrees".equals(regname.getNamespace())) {
if(!regname.getPath().contains("branch")) return;
try {
Block block = ForgeRegistries.BLOCKS.getValue(regname);
IBlockState state = block.getDefaultState();
for(IProperty<?> vaprop: state.getProperties().keySet()) {
if(!("radius".equals(vaprop.getName())) || (vaprop.getValueClass() != Integer.class)) continue;
@SuppressWarnings("unchecked")
IProperty<Integer> prop = (IProperty<Integer>)vaprop;
Integer max = ((Collection<Integer>)prop.getAllowedValues()).stream().max(Integer::compare).orElse(0);
if(max<7) continue;
for(int r=7; r<=max; ++r) choppable_states.put(state.withProperty(prop, r), ChoppingMethod.RootBlockBreaking);
}
} catch(Throwable e) {
LOGGER.warn("Failed to register chopping for " + regname.toString());
return;
}
}
});
}
LOGGER.info("Dynamic Trees chopping compat: " + choppable_states.size() + " choppable states found.");
} catch(Throwable e) {
choppable_states.clear();
LOGGER.warn("Failed to determine choppings for dynamic trees compat, skipping that:" + e);
}
}
private static boolean canChop(IBlockState state)
{ return choppable_states.containsKey(state); }
private static int chop(World world, IBlockState state, BlockPos pos, int max_blocks_to_break, boolean without_target_block)
{
final int default_expense = 5;
switch(choppable_states.getOrDefault(state, ChoppingMethod.None)) {
case None:
return 0;
case RootBlockBreaking: {
if(num_breaking_exceptions < 16) {
try {
world.setBlockState(pos, Blocks.AIR.getDefaultState(), 1);
state.getBlock().breakBlock(world, pos, state);
} catch(Throwable e) {
if(++num_breaking_exceptions == 1) LOGGER.warn("Tree Chopper: There was an exception while trying to break a tree trunk ("+state.getBlock().getRegistryName()+"): " + e);
if(num_breaking_exceptions == 16) LOGGER.warn("Tree Chopper: There were 16 exceptions in total trying to chop modded trees. Feature has been disabled.");
}
}
return 5;
}
default:
return 0;
}
}
}
private static final List<Vec3i> hoffsets = ImmutableList.of(
new Vec3i( 1,0, 0), new Vec3i( 1,0, 1), new Vec3i( 0,0, 1),
new Vec3i(-1,0, 1), new Vec3i(-1,0, 0), new Vec3i(-1,0,-1),
new Vec3i( 0,0,-1), new Vec3i( 1,0,-1)
);
public static void reload()
{ Compat.reload(); }
private static List<BlockPos> findBlocksAround(final World world, final BlockPos centerPos, final IBlockState leaf_type_state, final Set<BlockPos> checked, int recursion_left)
{
ArrayList<BlockPos> to_decay = new ArrayList<BlockPos>();
@ -47,13 +122,14 @@ public class TreeCutting
}
public static boolean canChop(IBlockState state)
{ return BlockCategories.isLog(state); }
{ return BlockCategories.isLog(state) || Compat.canChop(state); }
/**
* Chops a tree, returns the damage that the cutting tool shall take
*/
public static int chopTree(World world, IBlockState broken_state, BlockPos startPos, int max_blocks_to_break, boolean without_target_block)
{
if((Compat.canChop(broken_state))) return Compat.chop(world, broken_state, startPos, max_blocks_to_break, without_target_block);
if(!BlockCategories.isLog(broken_state)) return 0;
final long ymin = startPos.getY();
final long max_leaf_distance = 6;

20
1.12/src/main/resources/assets/engineersdecor/blockstates/steel_mesh_fence.json Normal file
View file

@ -0,0 +1,20 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:fence/steel_mesh_fence_default",
"textures": {
"wall": "engineersdecor:blocks/fence/steel_mesh_fence",
"postside": "engineersdecor:blocks/fence/steel_mesh_pole_side",
"top": "engineersdecor:blocks/fence/steel_mesh_top",
"particle": "engineersdecor:blocks/fence/steel_mesh_top"
}
},
"variants": {
"inventory": { "model": "engineersdecor:fence/steel_mesh_fence_inventory" },
"up" : { "false":{}, "true": {"submodel": {"smwfence_up" : {"model": "engineersdecor:fence/steel_mesh_fence_post" }}} },
"north": { "false":{}, "true": {"submodel": {"smwfence_north" : {"model": "engineersdecor:fence/steel_mesh_fence_side", "uvlock": true, "y": 0 }}} },
"east" : { "false":{}, "true": {"submodel": {"smwfence_east" : {"model": "engineersdecor:fence/steel_mesh_fence_side", "uvlock": true, "y": 90 }}} },
"south": { "false":{}, "true": {"submodel": {"smwfence_south" : {"model": "engineersdecor:fence/steel_mesh_fence_side", "uvlock": true, "y": 180 }}} },
"west" : { "false":{}, "true": {"submodel": {"smwfence_west" : {"model": "engineersdecor:fence/steel_mesh_fence_side", "uvlock": true, "y": 270 }}} }
}
}

11
1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_broad_windowsill.json Normal file
View file

@ -0,0 +1,11 @@
{
"forge_marker": 1,
"defaults": {
"model": "engineersdecor:furniture/treated_wood_windowsill_broad_model"
},
"variants": {
"normal": [{}],
"inventory": [{}],
"facing": { "north": {"y":0}, "south": {"y":180}, "west": {"y":-90}, "east": {"y":90}, "up":{}, "down":{} }
}
}

4
1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
View file

@ -108,8 +108,12 @@ tile.engineersdecor.treated_wood_window.name=Treated Wood Window
tile.engineersdecor.treated_wood_window.help=§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes.
tile.engineersdecor.treated_wood_windowsill.name=Treated Wood Window Sill
tile.engineersdecor.treated_wood_windowsill.help=§6Simple window decoration.
tile.engineersdecor.treated_wood_broad_windowsill.name=Broad Treated Wood Window Sill
tile.engineersdecor.treated_wood_broad_windowsill.help=§6Simple window decoration.
tile.engineersdecor.steel_framed_window.name=Steel Framed Window
tile.engineersdecor.steel_framed_window.help=§6Steel framed triple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes.
tile.engineersdecor.steel_mesh_fence.name=Steel Mesh Fence
tile.engineersdecor.steel_mesh_fence.help=§6Industrial style fence.§r\nDoes not connect do regular fences.
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.small_lab_furnace.name=Small Laboratory Furnace
tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Solid fuel consuming, updraught. \

4
1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
View file

@ -105,8 +105,12 @@ tile.engineersdecor.treated_wood_window.name=Обработанное дерев
tile.engineersdecor.treated_wood_window.help=§6Деревянный каркас окна с тройным остеклением. Ну и шумоизоляция.
tile.engineersdecor.treated_wood_windowsill.name=Обработанный деревянный подоконник
tile.engineersdecor.treated_wood_windowsill.help=§6Простое оформление окон.
tile.engineersdecor.treated_wood_broad_windowsill.name=Broad Treated Wood Window Sill
#tile.engineersdecor.treated_wood_broad_windowsill.help=§6Simple window decoration.
tile.engineersdecor.steel_framed_window.name=Окно со стальной рамой
tile.engineersdecor.steel_framed_window.help=§6Стальной каркас окна с тройным остеклением. Хорошо изолирует. §r Не подключается к смежным блокам, таким как стеклянные панели.
tile.engineersdecor.steel_mesh_fence.name=Steel Mesh Fence
#tile.engineersdecor.steel_mesh_fence.help=§6Industrial style fence.§r\nDoes not connect do regular fences.
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь
tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива сверху. Немного горячее, чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива.

4
1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
View file

@ -106,8 +106,12 @@ tile.engineersdecor.treated_wood_window.name=Treated Wood Window
#tile.engineersdecor.treated_wood_window.help=§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes.
tile.engineersdecor.treated_wood_windowsill.name=Treated Wood Window Sill
#tile.engineersdecor.treated_wood_windowsill.help=§6Simple window decoration.
tile.engineersdecor.treated_wood_broad_windowsill.name=Broad Treated Wood Window Sill
#tile.engineersdecor.treated_wood_broad_windowsill.help=§6Simple window decoration.
tile.engineersdecor.steel_framed_window.name=Steel Framed Window
#tile.engineersdecor.steel_framed_window.help=§6Steel framed triple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes.
tile.engineersdecor.steel_mesh_fence.name=Steel Mesh Fence
#tile.engineersdecor.steel_mesh_fence.help=§6Industrial style fence.§r\nDoes not connect do regular fences.
#-----------------------------------------------------------------------------------------------------------
tile.engineersdecor.small_lab_furnace.name=Small Laboratory Furnace
#tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Solid fuel consuming, updraught. \

9
1.12/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_default.json Normal file
View file

@ -0,0 +1,9 @@
{
"textures": {
"wall": "engineersdecor:blocks/fence/steel_mesh_fence",
"particle": "engineersdecor:blocks/fence/steel_mesh_fence"
},
"elements": [{
"from": [7.9, 7.9, 7.9], "to": [8, 8, 8], "faces": { "down": {"texture": "#wall"} }
}]
}

427
1.12/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_inventory.json Normal file
View file

@ -0,0 +1,427 @@
{
"parent": "block/block",
"ambientocclusion": false,
"textures": {
"wall": "engineersdecor:blocks/fence/steel_mesh_fence",
"particle": "engineersdecor:blocks/fence/steel_mesh_fence",
"top": "engineersdecor:blocks/fence/steel_mesh_top"
},
"elements": [
{
"name": "Full wall",
"from": [7, 0, 0.5],
"to": [9, 16, 2.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7, 0, 13.5],
"to": [9, 16, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 0.125, 2.5],
"to": [8.125, 0.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 4.125, 2.5],
"to": [8.125, 4.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 5.8125],
"to": [8.05, 15.375, 6.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 8.125, 2.5],
"to": [8.125, 8.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 9.8125],
"to": [8.05, 15.375, 10.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 12.125, 2.5],
"to": [8.125, 12.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 2.125, 2.5],
"to": [8.125, 2.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 3.8125],
"to": [8.05, 15.375, 4.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 6.125, 2.5],
"to": [8.125, 6.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 7.8125],
"to": [8.05, 15.375, 8.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 10.125, 2.5],
"to": [8.125, 10.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 11.8125],
"to": [8.05, 15.375, 12.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 14.125, 2.5],
"to": [8.125, 14.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 1.125, 2.5],
"to": [8, 1.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 2.8125],
"to": [8.05, 15.375, 3.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 5.125, 2.5],
"to": [8, 5.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 6.8125],
"to": [8.05, 15.375, 7.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 9.125, 2.5],
"to": [8, 9.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 10.8125],
"to": [8.05, 15.375, 11.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 13.125, 2.5],
"to": [8, 13.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 15.125, 2.5],
"to": [8, 15.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 3.125, 2.5],
"to": [8, 3.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 4.8125],
"to": [8.05, 15.375, 5.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 7.125, 2.5],
"to": [8, 7.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 8.8125],
"to": [8.05, 15.375, 9.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 11.125, 2.5],
"to": [8, 11.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 12.8125],
"to": [8.05, 15.375, 13.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
}
],
"display": {
"gui": {
"rotation": [30, 135, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}
}

22
1.12/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_post.json Normal file
View file

@ -0,0 +1,22 @@
{
"textures": {
"postside": "engineersdecor:blocks/fence/steel_mesh_pole_side",
"top": "engineersdecor:blocks/fence/steel_mesh_top",
"particle": "engineersdecor:blocks/fence/steel_mesh_top"
},
"elements": [
{
"name": "Center post",
"from": [6.5, 0, 6.5],
"to": [9.5, 16, 9.5],
"faces": {
"north": {"texture": "#postside"},
"east": {"texture": "#postside"},
"south": {"texture": "#postside"},
"west": {"texture": "#postside"},
"up": {"texture": "#top", "cullface": "up"},
"down": {"texture": "#top"}
}
}
]
}

176
1.12/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_side.json Normal file
View file

@ -0,0 +1,176 @@
{
"textures": {
"wall": "engineersdecor:blocks/fence/steel_mesh_fence"
},
"elements": [
{
"from": [8, 15.625, 0.0625],
"to": [8.1875, 15.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 8, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 13.625, 0.0625],
"to": [8, 13.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, 6, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 9.625, 0.0625],
"to": [8, 9.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, 2, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 5.625, 0.0625],
"to": [8, 5.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, -2, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 1.625, 0.0625],
"to": [8, 1.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, -6, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 11.625, 0.0625],
"to": [8.1875, 11.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 4, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 7.625, 0.0625],
"to": [8.1875, 7.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 0, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 3.625, 0.0625],
"to": [8.1875, 3.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, -4, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 1.875],
"to": [8.125, 15.855, 2.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 9.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 0],
"to": [8.125, 15.855, 0.1875],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 7.8125],
"to": [8.125, 15.855, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 15.8125]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 3.875],
"to": [8.125, 15.855, 4.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 11.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 5.875],
"to": [8.125, 15.855, 6.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 13.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
}
]
}

113
1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json Normal file
View file

@ -0,0 +1,113 @@
{
"parent": "block/cube",
"textures": {
"o": "engineersdecor:blocks/iestyle/treated_wood_rough_texture",
"particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture"
},
"elements": [
{
"from": [1.625, 8.625, 13],
"to": [3.375, 16, 14.625],
"rotation": {"angle": -45, "axis": "x", "origin": [2.5, 11, 13.125]},
"faces": {
"north": {"uv": [12.625, 0, 14.375, 7.375], "texture": "#o"},
"east": {"uv": [1.375, 0, 3, 7.375], "texture": "#o"},
"south": {"uv": [1.625, 0, 3.375, 7.375], "texture": "#o"},
"west": {"uv": [13, 0, 14.625, 7.375], "texture": "#o"}
}
},
{
"from": [12.625, 8.625, 13],
"to": [14.375, 16, 14.625],
"rotation": {"angle": -45, "axis": "x", "origin": [13.5, 11, 13.125]},
"faces": {
"north": {"uv": [1.625, 0, 3.375, 7.375], "texture": "#o"},
"east": {"uv": [1.375, 0, 3, 7.375], "texture": "#o"},
"south": {"uv": [12.625, 0, 14.375, 7.375], "texture": "#o"},
"west": {"uv": [13, 0, 14.625, 7.375], "texture": "#o"}
}
},
{
"from": [0, 14.5, 4],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 1.5], "texture": "#o"},
"east": {"uv": [0, 0, 12, 1.5], "texture": "#o"},
"south": {"uv": [0, 0, 16, 1.5], "texture": "#o"},
"west": {"uv": [4, 0, 16, 1.5], "texture": "#o"},
"up": {"uv": [0, 4, 16, 16], "texture": "#o"},
"down": {"uv": [0, 0, 16, 12], "texture": "#o"}
}
},
{
"from": [1.5, 9, 14.375],
"to": [3.5, 15, 16],
"faces": {
"north": {"uv": [12.5, 1, 14.5, 7], "texture": "#o"},
"east": {"uv": [0, 1, 1.625, 7], "texture": "#o"},
"south": {"uv": [1.5, 1, 3.5, 7], "texture": "#o"},
"west": {"uv": [14.375, 1, 16, 7], "texture": "#o"},
"down": {"uv": [1.5, 0, 3.5, 1.625], "texture": "#o"}
}
},
{
"from": [3.5, 14, 14.375],
"to": [12.5, 15, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [10.25, 8, 8]},
"faces": {
"north": {"uv": [3.5, 1, 12.5, 2], "texture": "#o"},
"east": {"uv": [0, 1, 1.625, 2], "texture": "#o"},
"south": {"uv": [3.5, 1, 12.5, 2], "texture": "#o"},
"west": {"uv": [14.375, 1, 16, 2], "texture": "#o"},
"down": {"uv": [3.5, 0, 12.5, 1.625], "texture": "#o"}
}
},
{
"from": [1.5, 14, 5.5],
"to": [14.5, 15, 14.375],
"rotation": {"angle": 0, "axis": "y", "origin": [10.25, 8, 3]},
"faces": {
"north": {"uv": [1.5, 1, 14.5, 2], "texture": "#o"},
"east": {"uv": [1.625, 1, 10.5, 2], "texture": "#o"},
"south": {"uv": [1.5, 1, 14.5, 2], "texture": "#o"},
"west": {"uv": [5.5, 1, 14.375, 2], "texture": "#o"},
"down": {"uv": [1.5, 1.625, 14.5, 10.5], "texture": "#o"}
}
},
{
"from": [12.5, 9, 14.25],
"to": [14.5, 15, 16],
"faces": {
"north": {"uv": [1.5, 1, 3.5, 7], "texture": "#o"},
"east": {"uv": [0, 1, 1.75, 7], "texture": "#o"},
"south": {"uv": [12.5, 1, 14.5, 7], "texture": "#o"},
"west": {"uv": [14.25, 1, 16, 7], "texture": "#o"},
"down": {"uv": [12.5, 0, 14.5, 1.75], "texture": "#o"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [-8, 154, 97],
"translation": [-1.75, -1.75, -2.25],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_righthand": {
"rotation": [-2, -59, -46],
"translation": [0, -0.75, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.2, 0.2, 0.2]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0.75, -4.5, -3],
"scale": [0.7, 0.7, 0.7]
},
"fixed": {
"translation": [0, 0, -3.75],
"scale": [0.5, 0.5, 0.5]
}
}
}

28
1.12/src/main/resources/assets/engineersdecor/recipes/brick/steel_mesh_fence_recipe.json Normal file
View file

@ -0,0 +1,28 @@
{
"conditions": [
{
"type": "engineersdecor:grc",
"result": "engineersdecor:steel_mesh_fence",
"required": ["engineersdecor:thin_steel_pole"]
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"PNP",
"PNP"
],
"key": {
"P": {
"item": "engineersdecor:thin_steel_pole",
"data": 0
},
"N": {
"item": "minecraft:iron_nugget",
"data": 0
}
},
"result": {
"item": "engineersdecor:steel_mesh_fence",
"count": 6
}
}

23
1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_broad_windowsill_recipe.json Normal file
View file

@ -0,0 +1,23 @@
{
"conditions": [
{
"type": "engineersdecor:grc",
"result": "engineersdecor:treated_wood_broad_windowsill",
"required": ["engineersdecor:treated_wood_windowsill"]
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"WW"
],
"key": {
"W": {
"item": "engineersdecor:treated_wood_windowsill",
"data": 0
}
},
"result": {
"item": "engineersdecor:treated_wood_broad_windowsill",
"count": 2
}
}

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/fence/steel_mesh_fence.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 388 B

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/fence/steel_mesh_pole_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 342 B

BIN
1.12/src/main/resources/assets/engineersdecor/textures/blocks/fence/steel_mesh_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 373 B

2
1.12/src/main/resources/mcmod.info
View file

@ -7,7 +7,7 @@
"mcversion": "${mcversion}",
"url": "https://github.com/stfwi/engineers-decor/",
"authorList": ["wile"],
"credits": "BluSunrize, malte0811, et al., the Forge Smiths, the Modders of the World.",
"credits": "BluSunrize, Damien Hazard, malte0811, et al., the Forge Smiths, the Modders of the World.",
"logoFile": "assets/engineersdecor/logo.png",
"screenshots": [],
"useDependencyInformation": false,

9
1.14/Makefile
View file

@ -24,18 +24,23 @@ wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst
#
# Targets
#
.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server assets
.PHONY: default mod data init clean clean-all mrproper all run install sanatize dist-check dist start-server assets
default: mod
all: clean clean-all mod | install
mod:
mod: data
@echo "[1.14] Building mod using gradle ..."
@$(GRADLE) build $(GRADLE_OPTS)
data:
@echo "[1.14] Running data generators ..."
@djs tasks.js datagen
clean:
@echo "[1.14] Cleaning ..."
@rm -rf src/generated
@rm -rf mcmodsrepo
@rm -f build/libs/*
@$(GRADLE) clean

4
1.14/gradle.properties
View file

@ -2,7 +2,7 @@
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx8G
version_minecraft=1.14.4
version_forge_minecraft=1.14.4-28.0.105
version_forge_minecraft=1.14.4-28.1.31
version_fml_mappings=20190719-1.14.3
version_jei=1.14.4:6.0.0.10
version_engineersdecor=1.0.13-b1
version_engineersdecor=1.0.13-b3

3
1.14/meta/update.json
View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.14.4": {
"1.0.13-b2": "[A] Added Steel Mesh Fence.\n[A] Added Broad Window Sill.",
"1.0.12-b3": "[U] Updated to Forge 1.14.4-28.1.10/20190719-1.14.3.\n[A] Crafting Table: Added recipe collision resolver, also applies to crafting history refabrication.\n[A] Crafting Table: Added rendering of placed items on the top surface of the table.\n[A] Waterlogging of non-full-blocks added.",
"1.0.12-b2": "[U] Updated to Forge 1.14.4-28.0.105/20190719-1.14.3.\n[A] Small Solar Panel added.\n[M] Items fall through the Steel Floor Grating like in 1.12.2 version.\n[M] Factory Dropper: Added pulse/continuous mode in GUI (issue #51, thx Aristine for the CR).",
"1.0.12-b1": "[U] Updated to Forge 1.14.4-28.0.93/20190719-1.14.3.\n[M] Logo location fixed.",
@ -25,6 +26,6 @@
},
"promos": {
"1.14.4-recommended": "",
"1.14.4-latest": "1.0.12-b3"
"1.14.4-latest": "1.0.13-b2"
}
}

6
1.14/readme.md
View file

@ -11,7 +11,11 @@ Mod sources for Minecraft version 1.14.4.
## Version history
~ v1.0.13-b1 [A]
~ v1.0.13-b3 [U] Updated to Forge 1.14.4-28.1.31/20190719-1.14.3.
[M] Switched to integrated loot table generation.
- v1.0.13-b2 [A] Added Steel Mesh Fence.
[A] Added Broad Window Sill.
- v1.0.12-b3 [U] Updated to Forge 1.14.4-28.1.10/20190719-1.14.3.
[A] Crafting Table: Added recipe collision resolver,

31
1.14/src/main/java/wile/engineersdecor/ModContent.java
View file

@ -210,6 +210,12 @@ public class ModContent
ModAuxiliaries.getPixeledAABB(0.5,15,10.5, 15.5,16,16)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_windowsill"));
public static final BlockDecorDirected.WaterLoggable TREATED_WOOD_BROAD_WINDOWSILL = (BlockDecorDirected.WaterLoggable)(new BlockDecorDirected.WaterLoggable(
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_FACING_PLACEMENT,
Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD),
ModAuxiliaries.getPixeledAABB(0,14.5,4, 16,16,16)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_broad_windowsill"));
public static final BlockDecorDirected.WaterLoggable INSET_LIGHT_IRON = (BlockDecorDirected.WaterLoggable)(new BlockDecorDirected.WaterLoggable(
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).lightValue(15),
@ -442,6 +448,13 @@ public class ModContent
// -------------------------------------------------------------------------------------------------------------------
public static final BlockDecorFence STEEL_MESH_FENCE = (BlockDecorFence)(new BlockDecorFence(
BlockDecor.CFG_CUTOUT,
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL)
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "steel_mesh_fence"));
// -------------------------------------------------------------------------------------------------------------------
private static final Block modBlocks[] = {
TREATED_WOOD_CRAFTING_TABLE,
SMALL_LAB_FURNACE,
@ -486,11 +499,13 @@ public class ModContent
TREATED_WOOD_STOOL,
TREATED_WOOD_SIDE_TABLE,
TREATED_WOOD_WINDOWSILL,
TREATED_WOOD_BROAD_WINDOWSILL,
TREATED_WOOD_WINDOW,
STEEL_FRAMED_WINDOW,
STEEL_TABLE,
INSET_LIGHT_IRON,
STEEL_FLOOR_GRATING,
STEEL_MESH_FENCE,
TREATED_WOOD_POLE,
TREATED_WOOD_POLE_HEAD,
TREATED_WOOD_POLE_SUPPORT,
@ -631,6 +646,14 @@ public class ModContent
private static ArrayList<Block> registeredBlocks = new ArrayList<>();
public static ArrayList<Block> allBlocks()
{
ArrayList<Block> blocks = new ArrayList<>();
Collections.addAll(blocks, modBlocks);
Collections.addAll(blocks, devBlocks);
return blocks;
}
public static boolean isExperimentalBlock(Block block)
{ return ArrayUtils.contains(devBlocks, block); }
@ -640,17 +663,13 @@ public class ModContent
public static final void registerBlocks(final RegistryEvent.Register<Block> event)
{
ArrayList<Block> allBlocks = new ArrayList<>();
Collections.addAll(allBlocks, modBlocks);
if(ModAuxiliaries.isModLoaded("immersiveengineering")) ModAuxiliaries.logInfo("Immersive Engineering also installed ...");
// @todo: config not available yet, other registration control for experimental features needed.
Collections.addAll(allBlocks, devBlocks);
registeredBlocks.addAll(allBlocks);
registeredBlocks.addAll(allBlocks());
for(Block e:registeredBlocks) event.getRegistry().register(e);
ModAuxiliaries.logInfo("Registered " + Integer.toString(registeredBlocks.size()) + " blocks.");
}
public static final void registerItemBlocks(final RegistryEvent.Register<Item> event)
public static final void registerBlockItems(final RegistryEvent.Register<Item> event)
{
int n = 0;
for(Block e:registeredBlocks) {

15
1.14/src/main/java/wile/engineersdecor/ModEngineersDecor.java
View file

@ -4,6 +4,7 @@ import wile.engineersdecor.detail.ModConfig;
import wile.engineersdecor.detail.Networking;
import wile.engineersdecor.blocks.*;
import wile.engineersdecor.detail.OptionalRecipeCondition.Serializer;
import wile.engineersdecor.datagen.ModLootTables;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.player.PlayerEntity;
@ -22,10 +23,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
import net.minecraftforge.fml.event.lifecycle.*;
import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.api.distmarker.Dist;
@ -85,7 +83,7 @@ public class ModEngineersDecor
@SubscribeEvent
public static void onItemRegistry(final RegistryEvent.Register<Item> event)
{ ModContent.registerItemBlocks(event); }
{ ModContent.registerBlockItems(event); }
@SubscribeEvent
public static void onTileEntityRegistry(final RegistryEvent.Register<TileEntityType<?>> event)
@ -124,6 +122,13 @@ public class ModEngineersDecor
ModEngineersDecor.logger().error("Failed to load changed config: " + e.getMessage());
}
}
@SubscribeEvent
public static void onDataGeneration(GatherDataEvent event)
{
event.getGenerator().addProvider(new ModLootTables(event.getGenerator()));
}
}
//

6
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecor.java
View file

@ -140,16 +140,16 @@ public class BlockDecor extends Block implements IDecorBlock
@Override
public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid)
{ return dropBlock(state, world, pos, false); }
{ return hasDynamicDropList() ? dropBlock(state, world, pos, false) : super.removedByPlayer(state, world,pos , player, willHarvest, fluid); }
@Override
public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion)
{ dropBlock(world.getBlockState(pos), world, pos, false); }
{ if(hasDynamicDropList()) dropBlock(world.getBlockState(pos), world, pos, true); }
@Override
@SuppressWarnings("deprecation")
public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder)
{ return Collections.singletonList(ItemStack.EMPTY); } // { return Collections.singletonList(new ItemStack(this.asItem())); } //
{ return hasDynamicDropList() ? Collections.singletonList(ItemStack.EMPTY) : super.getDrops(state, builder); }
@Override
public boolean propagatesSkylightDown(BlockState state, IBlockReader reader, BlockPos pos)

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorCraftingTable.java
View file

@ -108,6 +108,10 @@ public class BlockDecorCraftingTable extends BlockDecorDirected.WaterLoggable
((BTileEntity)te).markDirty();
}
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java
View file

@ -113,6 +113,10 @@ public class BlockDecorDropper extends BlockDecorDirected
((BlockDecorDropper.BTileEntity)te).markDirty();
}
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{

115
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorFence.java Normal file
View file

@ -0,0 +1,115 @@
/*
* @file BlockDecorWall.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2019 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Wall blocks.
*/
package wile.engineersdecor.blocks;
import wile.engineersdecor.detail.ModAuxiliaries;
import net.minecraft.world.*;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.IFluidState;
import net.minecraft.entity.EntityType;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.state.StateContainer;
import net.minecraft.block.*;
import net.minecraft.block.material.PushReaction;
import net.minecraft.block.BlockState;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
import java.util.List;
public class BlockDecorFence extends WallBlock implements IDecorBlock
{
private final VoxelShape[] shape_voxels;
private final VoxelShape[] collision_shape_voxels;
public BlockDecorFence(long config, Block.Properties builder)
{
super(builder);
this.shape_voxels = buildWallShapes(1.5f, 1.5f, 16f, 0f, 16f);
this.collision_shape_voxels = buildWallShapes(1.5f, 1.5f, 24f, 0f, 24f);
}
@Override
@OnlyIn(Dist.CLIENT)
public void addInformation(ItemStack stack, @Nullable IBlockReader world, List<ITextComponent> tooltip, ITooltipFlag flag)
{ ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); }
protected VoxelShape[] buildWallShapes(float pole_width_x, float pole_width_z, float pole_height, float side_min_y, float side_max_y)
{ return super.makeShapes(pole_width_x, pole_width_z, pole_height, side_min_y, side_max_y); }
@Override
public VoxelShape getShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext selectionContext)
{ return shape_voxels[this.getIndex(state)]; }
@Override
public VoxelShape getCollisionShape(BlockState state, IBlockReader world, BlockPos pos, ISelectionContext selectionContext)
{ return collision_shape_voxels[this.getIndex(state)]; }
@Override
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder)
{ super.fillStateContainer(builder); }
private boolean attachesTo(BlockState facingState, IWorldReader world, BlockPos facingPos, Direction side)
{
final Block block = facingState.getBlock();
if((block instanceof FenceGateBlock) || (block instanceof BlockDecorFence) || (block instanceof BlockDecorWall)) return true;
final BlockState oppositeState = world.getBlockState(facingPos.offset(side, 2));
if(!(oppositeState.getBlock() instanceof BlockDecorFence)) return false;
return facingState.isNormalCube(world, facingPos) && hasSolidSide(facingState, world, facingPos, side);
}
public BlockState getStateForPlacement(BlockItemUseContext context)
{
IWorldReader world = context.getWorld();
BlockPos pos = context.getPos();
IFluidState fs = context.getWorld().getFluidState(context.getPos());
boolean n = attachesTo(world.getBlockState(pos.north()), world, pos.north(), Direction.SOUTH);
boolean e = attachesTo(world.getBlockState(pos.east()), world, pos.east(), Direction.WEST);
boolean s = attachesTo(world.getBlockState(pos.south()), world, pos.south(), Direction.NORTH);
boolean w = attachesTo(world.getBlockState(pos.west()), world, pos.west(), Direction.EAST);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return getDefaultState().with(UP, not_straight).with(NORTH, n).with(EAST, e).with(SOUTH, s).with(WEST, w).with(WATERLOGGED, fs.getFluid() == Fluids.WATER);
}
@Override
public BlockState updatePostPlacement(BlockState state, Direction side, BlockState facingState, IWorld world, BlockPos currentPos, BlockPos facingPos)
{
if(state.get(WATERLOGGED)) world.getPendingFluidTicks().scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickRate(world));
if(side == Direction.DOWN) return super.updatePostPlacement(state, side, facingState, world, currentPos, facingPos);
boolean n = (side==Direction.NORTH) ? attachesTo(facingState, world, facingPos, side) : state.get(NORTH);
boolean e = (side==Direction.EAST) ? attachesTo(facingState, world, facingPos, side) : state.get(EAST);
boolean s = (side==Direction.SOUTH) ? attachesTo(facingState, world, facingPos, side) : state.get(SOUTH);
boolean w = (side==Direction.WEST) ? attachesTo(facingState, world, facingPos, side) : state.get(WEST);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return state.with(UP, not_straight).with(NORTH, n).with(EAST, e).with(SOUTH, s).with(WEST, w);
}
@Override
@SuppressWarnings("deprecation")
public boolean canEntitySpawn(BlockState state, IBlockReader world, BlockPos pos, EntityType<?> entityType)
{ return false; }
@Override
public boolean canSpawnInBlock()
{ return false; }
@Override
@SuppressWarnings("deprecation")
public PushReaction getPushReaction(BlockState state)
{ return PushReaction.NORMAL; }
}

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java
View file

@ -121,6 +121,10 @@ public class BlockDecorFurnace extends BlockDecorDirected
world.setBlockState(pos, state.with(LIT, bte.burning()));
}
@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>();

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorHalfSlab.java
View file

@ -124,6 +124,10 @@ public class BlockDecorHalfSlab extends BlockDecor implements IWaterLoggable
public BlockState mirror(BlockState state, Mirror mirrorIn)
{ return state; }
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{ return new ArrayList<ItemStack>(Collections.singletonList(new ItemStack(this.asItem(), num_slabs_contained_in_parts_[state.get(PARTS) & 0xf]))); }

7
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java
View file

@ -95,11 +95,4 @@ public class BlockDecorLadder extends LadderBlock implements IDecorBlock
player.setMotionMultiplier(state, new Vec3d(0.2, (lvy>0)?(3):(6), 0.2));
}
@Override
public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid)
{ return BlockDecor.dropBlock(state, world, pos, false); }
@Override
public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion)
{ BlockDecor.dropBlock(world.getBlockState(pos), world, pos, true); }
}

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java
View file

@ -93,6 +93,10 @@ public class BlockDecorMineralSmelter extends BlockDecorDirectedHorizontal
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack)
{}
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorSlab.java
View file

@ -109,6 +109,10 @@ public class BlockDecorSlab extends BlockDecor
public BlockState mirror(BlockState state, Mirror mirrorIn)
{ return state; }
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{ return new ArrayList<ItemStack>(Collections.singletonList(new ItemStack(this.asItem(), num_slabs_contained_in_parts_[state.get(PARTS) & 0x3]))); }

7
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java
View file

@ -53,11 +53,4 @@ public class BlockDecorStairs extends StairsBlock implements IDecorBlock
public PushReaction getPushReaction(BlockState state)
{ return PushReaction.NORMAL; }
@Override
public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid)
{ return BlockDecor.dropBlock(state, world, pos, false); }
@Override
public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion)
{ BlockDecor.dropBlock(world.getBlockState(pos), world, pos, true); }
}

34
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java
View file

@ -8,11 +8,11 @@
*/
package wile.engineersdecor.blocks;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.world.*;
import wile.engineersdecor.detail.ModAuxiliaries;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.IFluidState;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraft.entity.EntityType;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.state.StateContainer;
@ -28,8 +28,6 @@ import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import javax.annotation.Nullable;
@ -69,13 +67,26 @@ public class BlockDecorWall extends WallBlock implements IDecorBlock
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder)
{ super.fillStateContainer(builder); builder.add(TEXTURE_VARIANT); }
private boolean attachesTo(BlockState facingState, IWorld world, BlockPos facingPos, Direction side)
private boolean attachesTo(BlockState facingState, IWorldReader world, BlockPos facingPos, Direction side)
{
final Block block = facingState.getBlock();
if((block instanceof FenceGateBlock) || (block instanceof WallBlock)) return true;
// return this.func_220113_a(facingState, Block.func_220056_d(facingState, world, facingPos, side), side);
// @todo: CHANGE HERE WHEN DEOBF METHOD IS AVAILABLE
return false;
final BlockState oppositeState = world.getBlockState(facingPos.offset(side, 2));
if(!(oppositeState.getBlock() instanceof BlockDecorWall)) return false;
return facingState.isNormalCube(world, facingPos) && hasSolidSide(facingState, world, facingPos, side);
}
public BlockState getStateForPlacement(BlockItemUseContext context)
{
IWorldReader world = context.getWorld();
BlockPos pos = context.getPos();
IFluidState fs = context.getWorld().getFluidState(context.getPos());
boolean n = attachesTo(world.getBlockState(pos.north()), world, pos.north(), Direction.SOUTH);
boolean e = attachesTo(world.getBlockState(pos.east()), world, pos.east(), Direction.WEST);
boolean s = attachesTo(world.getBlockState(pos.south()), world, pos.south(), Direction.NORTH);
boolean w = attachesTo(world.getBlockState(pos.west()), world, pos.west(), Direction.EAST);
boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w);
return getDefaultState().with(UP, not_straight).with(NORTH, n).with(EAST, e).with(SOUTH, s).with(WEST, w).with(WATERLOGGED, fs.getFluid() == Fluids.WATER);
}
@Override
@ -105,11 +116,4 @@ public class BlockDecorWall extends WallBlock implements IDecorBlock
public PushReaction getPushReaction(BlockState state)
{ return PushReaction.NORMAL; }
@Override
public boolean removedByPlayer(BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid)
{ return BlockDecor.dropBlock(state, world, pos, false); }
@Override
public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion)
{ BlockDecor.dropBlock(world.getBlockState(pos), world, pos, true); }
}

4
1.14/src/main/java/wile/engineersdecor/blocks/BlockDecorWasteIncinerator.java
View file

@ -110,6 +110,10 @@ public class BlockDecorWasteIncinerator extends BlockDecor
((BlockDecorWasteIncinerator.BTileEntity)te).markDirty();
}
@Override
public boolean hasDynamicDropList()
{ return true; }
@Override
public List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{

5
1.14/src/main/java/wile/engineersdecor/blocks/IDecorBlock.java
View file

@ -16,9 +16,12 @@ import java.util.Collections;
import java.util.List;
interface IDecorBlock
public interface IDecorBlock
{
default boolean hasDynamicDropList()
{ return false; }
default List<ItemStack> dropList(BlockState state, World world, BlockPos pos, boolean explosion)
{ return Collections.singletonList((!world.isRemote()) ? (new ItemStack(state.getBlock().asItem())) : (ItemStack.EMPTY)); }

92
1.14/src/main/java/wile/engineersdecor/datagen/ModLootTables.java Normal file
View file

@ -0,0 +1,92 @@
/*
* @file ModLootTables.java
* @author Stefan Wilhelm (wile)
* @copyright (C) 2019 Stefan Wilhelm
* @license MIT (see https://opensource.org/licenses/MIT)
*
* Loot table generator.
*/
package wile.engineersdecor.datagen;
import wile.engineersdecor.ModContent;
import wile.engineersdecor.blocks.IDecorBlock;
import wile.engineersdecor.detail.ModAuxiliaries;
import net.minecraft.block.Block;
import net.minecraft.data.*;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.loot.*;
import net.minecraft.world.storage.loot.functions.CopyName;
import net.minecraft.world.storage.loot.functions.CopyName.Source;
import net.minecraft.world.storage.loot.functions.CopyNbt;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ModLootTables extends LootTableProvider
{
private static final Logger LOGGER = LogManager.getLogger();
private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().disableHtmlEscaping().create();
private final DataGenerator generator;
//--------------------------------------------------------------------------------------------------------------------
public ModLootTables(DataGenerator gen)
{ super(gen); generator=gen; }
//-- LootTableProvider -----------------------------------------------------------------------------------------------
@Override
public String getName()
{ return ModAuxiliaries.MODID + " Loot Tables"; }
@Override
public void act(DirectoryCache cache)
{ save(cache, generate()); }
//--------------------------------------------------------------------------------------------------------------------
private Map<ResourceLocation, LootTable> generate()
{
final HashMap<ResourceLocation, LootTable> tables = new HashMap<ResourceLocation, LootTable>();
final List<Block> blocks = ModContent.allBlocks();
blocks.forEach((block)->{
if((!(block instanceof IDecorBlock)) || (!(((IDecorBlock)block).hasDynamicDropList()))) {
tables.put(
block.getLootTable(),
defaultBlockDrops(block.getRegistryName().getPath() + "_dlt", block)
.setParameterSet(LootParameterSets.BLOCK).build());
}
});
return tables;
}
private void save(DirectoryCache cache, Map<ResourceLocation, LootTable> tables)
{
final Path root = generator.getOutputFolder();
tables.forEach((rl,tab)->{
Path fp = root.resolve("data/" + rl.getNamespace() + "/loot_tables/" + rl.getPath() + ".json");
try {
IDataProvider.save(GSON, cache, LootTableManager.toJson(tab), fp);
} catch(Exception e) {
LOGGER.error("Failed to save loottable '"+fp+"', exception: " + e);
}
});
}
private LootTable.Builder defaultBlockDrops(String rl_path, Block block)
{
ItemLootEntry.Builder iltb = ItemLootEntry.builder(block);
iltb.acceptFunction(CopyName.func_215893_a(Source.BLOCK_ENTITY));
if(block.hasTileEntity(block.getDefaultState())) {
iltb.acceptFunction(CopyNbt.func_215881_a(CopyNbt.Source.BLOCK_ENTITY));
}
return LootTable.builder().addLootPool(LootPool.builder().name(rl_path).rolls(ConstantRange.of(1)).addEntry(iltb));
}
}

2
1.14/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java
View file

@ -34,6 +34,8 @@ import java.util.regex.Pattern;
public class ModAuxiliaries
{
public static final String MODID = ModEngineersDecor.MODID;
/**
* Text localisation wrapper, implicitly prepends `ModEngineersDecor.MODID` to the
* translation keys. Forces formatting argument, nullable if no special formatting shall be applied..

2
1.14/src/main/resources/META-INF/mods.toml
View file

@ -10,7 +10,7 @@ version="${file.jarVersion}"
displayName="Engineer's Decor"
description="Adds cosmetic blocks for the engineer's workshop, factory and home."
authors="wilechaote"
credits="BluSunrize, malte0811, et al., the Forge Smiths, the Modders of the World."
credits="BluSunrize, Damien Hazard, malte0811, et al., the Forge Smiths, the Modders of the World."
updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/develop/meta/update.json"
displayURL="https://github.com/stfwi/engineers-decor/"
logoFile="logo.png"

9
1.14/src/main/resources/assets/engineersdecor/blockstates/steel_mesh_fence.json Normal file
View file

@ -0,0 +1,9 @@
{
"multipart": [
{ "when": { "up": "true" }, "apply": { "model": "engineersdecor:block/fence/steel_mesh_fence_post" } },
{ "when": { "north": "true" }, "apply": { "model": "engineersdecor:block/fence/steel_mesh_fence_side", "uvlock": true } },
{ "when": { "east": "true" }, "apply": { "model": "engineersdecor:block/fence/steel_mesh_fence_side", "y": 90, "uvlock": true } },
{ "when": { "south": "true" }, "apply": { "model": "engineersdecor:block/fence/steel_mesh_fence_side", "y": 180, "uvlock": true } },
{ "when": { "west": "true" }, "apply": { "model": "engineersdecor:block/fence/steel_mesh_fence_side", "y": 270, "uvlock": true } }
]
}

7
1.14/src/main/resources/assets/engineersdecor/blockstates/treated_wood_broad_windowsill.json Normal file
View file

@ -0,0 +1,7 @@
{
"forge_marker": 1,
"defaults": { "model": "engineersdecor:block/furniture/treated_wood_windowsill_broad_model" },
"variants": {
"facing": { "north": {"y":0}, "south": {"y":180}, "west": {"y":-90}, "east": {"y":90}, "up":{}, "down":{} }
}
}

12
1.14/src/main/resources/assets/engineersdecor/lang/en_us.json
View file

@ -73,6 +73,8 @@
"block.engineersdecor.rebar_concrete_tile_slab.help": "§6Steel reinforced concrete tile slab.§r Expensive but Creeper-proof like obsidian.",
"block.engineersdecor.panzerglass_slab": "Panzer Glass Slab",
"block.engineersdecor.panzerglass_slab.help": "§6Reinforced glass slab.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible.",
"block.engineersdecor.treated_wood_floor": "Treated Wood Floor",
"block.engineersdecor.treated_wood_floor.help": "§6Decorative floor tiles with texture variations.§r",
"block.engineersdecor.rebar_concrete_wall": "Rebar Concrete Wall",
"block.engineersdecor.rebar_concrete_wall.help": "§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.",
"block.engineersdecor.concrete_wall": "Concrete Wall",
@ -131,8 +133,12 @@
"block.engineersdecor.treated_wood_window.help": "§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes.",
"block.engineersdecor.treated_wood_windowsill": "Treated Wood Window Sill",
"block.engineersdecor.treated_wood_windowsill.help": "§6Simple window decoration.",
"block.engineersdecor.treated_wood_broad_windowsill": "Broad Treated Wood Window Sill",
"block.engineersdecor.treated_wood_broad_windowsill.help": "§6Simple window decoration.",
"block.engineersdecor.steel_framed_window": "Steel Framed Window",
"block.engineersdecor.steel_framed_window.help": "§6Steel framed triple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes.",
"block.engineersdecor.steel_mesh_fence": "Steel Mesh Fence",
"block.engineersdecor.steel_mesh_fence.help": "§6Industrial style fence.§r\nDoes not connect do regular fences.",
"block.engineersdecor.small_lab_furnace": "Small Laboratory Furnace",
"block.engineersdecor.small_lab_furnace.help": "§6Small metal cased lab kiln.§r Solid fuel consuming, updraught. Slightly hotter and better isolated than a cobblestone furnace, therefore more efficient. Two auxiliary slots e.g. for storage. Two stack internal hopper fifos for input, output, and fuel. Place an external heater into a aux slot and connect power for electrical smelting speed boost.",
"block.engineersdecor.small_electrical_furnace": "Small Electrical Furnace",
@ -153,6 +159,8 @@
"block.engineersdecor.small_mineral_smelter.help": "§6High temperature, high insulation electrical stone melting furnace.§r\n Heats up mineral blocks to magma blocks, and finally to lava. Due to the miniturized device size the process is rather inefficient - much time and energy is needed to liquefy a stone block.",
"block.engineersdecor.small_solar_panel": "Small Solar Panel",
"block.engineersdecor.small_solar_panel.help": "§6Produces a small amount of power when exposed to sunlight.§r\n Useful for charging LF capacitors in remote systems with low consumption. The internal charge pump circuit accumulates and frequently transfers RF. Production depends on day time and the weather.",
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
"block.engineersdecor.small_tree_cutter.help": "§6Chops grown trees in front of it.§r\n Does not collect the lumbers. Deactivate with a redstone signal. Provide RF power to boost the cutting speed (takes a long time without power).",
"block.engineersdecor.sign_decor": "Sign Plate (Engineer's decor)",
"block.engineersdecor.sign_decor.help": "§6This should not be craftable or visible in JEI. Used for creative tab and screenshots.",
"block.engineersdecor.sign_hotwire": "Sign \"Caution Hot Wire\"",
@ -181,5 +189,7 @@
"block.engineersdecor.halfslab_sheetmetal_gold": "Gold Sheet Metal Slice",
"block.engineersdecor.halfslab_sheetmetal_gold.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.",
"block.engineersdecor.halfslab_sheetmetal_aluminum": "Aluminum Sheet Metal Slice",
"block.engineersdecor.halfslab_sheetmetal_aluminum.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices."
"block.engineersdecor.halfslab_sheetmetal_aluminum.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.",
"block.engineersdecor.testblock": "ED Test Block (do NOT use)",
"block.engineersdecor.testblock.help": "§6Uncraftable mod testing block with changing experimental functionality. DO NOT USE, may even cause a crash in the worst case!!"
}

7
1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json
View file

@ -73,6 +73,7 @@
"block.engineersdecor.rebar_concrete_tile_slab.help": "§6Бетонная плитка, усиленная сталью.§r Дорогая, но взрывоустойчивая, как обсидиан.",
"block.engineersdecor.panzerglass_slab": "Плита из бронированного стекла",
"block.engineersdecor.panzerglass_slab.help": "§6Усиленная стеклянная плита.§r Дорогая, взрывоустойчивая. Имеет тёмно-серый оттенок, слегка видны структурные линии.",
"block.engineersdecor.treated_wood_floor": "Treated Wood Floor",
"block.engineersdecor.rebar_concrete_wall": "Железобетонная стена",
"block.engineersdecor.rebar_concrete_wall.help": "§6Стальная железобетонная стена.§r Дорогая, но взрывоустойчивая, как обсидиан.",
"block.engineersdecor.concrete_wall": "Бетонная стена",
@ -131,8 +132,10 @@
"block.engineersdecor.treated_wood_window.help": "§6Деревянный каркас окна с тройным остеклением. Ну и шумоизоляция.",
"block.engineersdecor.treated_wood_windowsill": "Обработанный деревянный подоконник",
"block.engineersdecor.treated_wood_windowsill.help": "§6Простое оформление окон.",
"block.engineersdecor.treated_wood_broad_windowsill": "Broad Treated Wood Window Sill",
"block.engineersdecor.steel_framed_window": "Окно со стальной рамой",
"block.engineersdecor.steel_framed_window.help": "§6Стальной каркас окна с тройным остеклением. Хорошо изолирует. §r Не подключается к смежным блокам, таким как стеклянные панели.",
"block.engineersdecor.steel_mesh_fence": "Steel Mesh Fence",
"block.engineersdecor.small_lab_furnace": "Компактная лабораторная печь",
"block.engineersdecor.small_lab_furnace.help": "§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива сверху. Немного горячее, чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива.",
"block.engineersdecor.small_electrical_furnace": "Компактная конвейерная электрическая печь",
@ -151,6 +154,7 @@
"block.engineersdecor.factory_dropper.help": "§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет 12 выборочных слотов. Сила броска, угол, размер стопки и задержка настраиваются в GUI. 3 слота сравнения стека с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, когда выполняются условия внутреннего запуска. Сбрасывает все соответствующие стеки одновременно. Нажмите на все элементы в GUI, чтобы увидеть, как это работает.",
"block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
"block.engineersdecor.small_solar_panel": "Small Solar Panel",
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
"block.engineersdecor.sign_decor": "Табличка с надписью (Логотип Engineer's decor)",
"block.engineersdecor.sign_decor.help": "§Это не должно быть крафтовым или видимым в JEI. Используется для творческой вкладки и скриншотов.",
"block.engineersdecor.sign_hotwire": "Знак «Осторожно, под напряжением»",
@ -179,5 +183,6 @@
"block.engineersdecor.halfslab_sheetmetal_gold": "Часть золотого листового металла",
"block.engineersdecor.halfslab_sheetmetal_gold.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.",
"block.engineersdecor.halfslab_sheetmetal_aluminum": "Часть алюминиевого листового металла",
"block.engineersdecor.halfslab_sheetmetal_aluminum.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей."
"block.engineersdecor.halfslab_sheetmetal_aluminum.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.",
"block.engineersdecor.testblock": "ED Test Block (do NOT use)"
}

7
1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json
View file

@ -63,6 +63,7 @@
"block.engineersdecor.rebar_concrete_slab": "Rebar Concrete Slab",
"block.engineersdecor.rebar_concrete_tile_slab": "Rebar Concrete Tile Slab",
"block.engineersdecor.panzerglass_slab": "Panzer Glass Slab",
"block.engineersdecor.treated_wood_floor": "Treated Wood Floor",
"block.engineersdecor.rebar_concrete_wall": "钢筋混凝土墙",
"block.engineersdecor.rebar_concrete_wall.help": "§6钢筋混凝土墙.§r 昂贵,但像黑曜石一样防苦力怕.",
"block.engineersdecor.concrete_wall": "水泥墙",
@ -102,7 +103,9 @@
"block.engineersdecor.iron_inset_light": "Inset Light",
"block.engineersdecor.treated_wood_window": "Treated Wood Window",
"block.engineersdecor.treated_wood_windowsill": "Treated Wood Window Sill",
"block.engineersdecor.treated_wood_broad_windowsill": "Broad Treated Wood Window Sill",
"block.engineersdecor.steel_framed_window": "Steel Framed Window",
"block.engineersdecor.steel_mesh_fence": "Steel Mesh Fence",
"block.engineersdecor.small_lab_furnace": "Small Laboratory Furnace",
"block.engineersdecor.small_electrical_furnace": "Small Electrical Furnace",
"block.engineersdecor.small_waste_incinerator": "Small Waste Incinerator",
@ -113,6 +116,7 @@
"block.engineersdecor.factory_dropper": "Factory Dropper",
"block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
"block.engineersdecor.small_solar_panel": "Small Solar Panel",
"block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
"block.engineersdecor.sign_decor": "Sign Plate (Engineer's decor)",
"block.engineersdecor.sign_hotwire": "Sign \"Caution Hot Wire\"",
"block.engineersdecor.sign_mindstep": "Sign \"Mind The Step\"",
@ -127,5 +131,6 @@
"block.engineersdecor.halfslab_sheetmetal_steel": "Steel Sheet Metal Slice",
"block.engineersdecor.halfslab_sheetmetal_copper": "Copper Sheet Metal Slice",
"block.engineersdecor.halfslab_sheetmetal_gold": "Gold Sheet Metal Slice",
"block.engineersdecor.halfslab_sheetmetal_aluminum": "Aluminum Sheet Metal Slice"
"block.engineersdecor.halfslab_sheetmetal_aluminum": "Aluminum Sheet Metal Slice",
"block.engineersdecor.testblock": "ED Test Block (do NOT use)"
}

427
1.14/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_inventory.json Normal file
View file

@ -0,0 +1,427 @@
{
"parent": "block/block",
"ambientocclusion": false,
"textures": {
"wall": "engineersdecor:block/fence/steel_mesh_fence",
"particle": "engineersdecor:block/fence/steel_mesh_fence",
"top": "engineersdecor:block/fence/steel_mesh_top"
},
"elements": [
{
"name": "Full wall",
"from": [7, 0, 0.5],
"to": [9, 16, 2.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7, 0, 13.5],
"to": [9, 16, 15.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 20.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 0.125, 2.5],
"to": [8.125, 0.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 4.125, 2.5],
"to": [8.125, 4.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 5.8125],
"to": [8.05, 15.375, 6.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 8.125, 2.5],
"to": [8.125, 8.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 9.8125],
"to": [8.05, 15.375, 10.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 12.125, 2.5],
"to": [8.125, 12.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 20, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [8, 2.125, 2.5],
"to": [8.125, 2.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 3.8125],
"to": [8.05, 15.375, 4.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 6.125, 2.5],
"to": [8.125, 6.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 7.8125],
"to": [8.05, 15.375, 8.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 10.125, 2.5],
"to": [8.125, 10.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 18, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 11.8125],
"to": [8.05, 15.375, 12.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [8, 14.125, 2.5],
"to": [8.125, 14.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 1.125, 2.5],
"to": [8, 1.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 2.8125],
"to": [8.05, 15.375, 3.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 5.125, 2.5],
"to": [8, 5.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 6.8125],
"to": [8.05, 15.375, 7.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 9.125, 2.5],
"to": [8, 9.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 10.8125],
"to": [8.05, 15.375, 11.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 13.125, 2.5],
"to": [8, 13.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 15.125, 2.5],
"to": [8, 15.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.875, 3.125, 2.5],
"to": [8, 3.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 4.8125],
"to": [8.05, 15.375, 5.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 7.125, 2.5],
"to": [8, 7.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 8.8125],
"to": [8.05, 15.375, 9.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
},
{
"name": "Full wall",
"from": [7.875, 11.125, 2.5],
"to": [8, 11.5, 13.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 14.5]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall", "cullface": "south"},
"west": {"texture": "#wall"},
"up": {"texture": "#top"},
"down": {"texture": "#wall", "cullface": "down"}
}
},
{
"name": "Full wall",
"from": [7.925, 0, 12.8125],
"to": [8.05, 15.375, 13.1875],
"rotation": {"angle": 0, "axis": "x", "origin": [7.875, 5.8125, 7.5]},
"faces": {
"north": {"rotation": 180, "texture": "#wall", "cullface": "down"},
"east": {"rotation": 270, "texture": "#wall"},
"south": {"texture": "#top"},
"west": {"rotation": 90, "texture": "#wall"},
"up": {"rotation": 180, "texture": "#wall", "cullface": "north"},
"down": {"texture": "#wall", "cullface": "south"}
}
}
],
"display": {
"gui": {
"rotation": [30, 135, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [0, 90, 0],
"scale": [0.5, 0.5, 0.5]
}
}
}

22
1.14/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_post.json Normal file
View file

@ -0,0 +1,22 @@
{
"textures": {
"postside": "engineersdecor:block/fence/steel_mesh_pole_side",
"top": "engineersdecor:block/fence/steel_mesh_top",
"particle": "engineersdecor:block/fence/steel_mesh_top"
},
"elements": [
{
"name": "Center post",
"from": [6.5, 0, 6.5],
"to": [9.5, 16, 9.5],
"faces": {
"north": {"texture": "#postside"},
"east": {"texture": "#postside"},
"south": {"texture": "#postside"},
"west": {"texture": "#postside"},
"up": {"texture": "#top", "cullface": "up"},
"down": {"texture": "#top"}
}
}
]
}

176
1.14/src/main/resources/assets/engineersdecor/models/block/fence/steel_mesh_fence_side.json Normal file
View file

@ -0,0 +1,176 @@
{
"textures": {
"wall": "engineersdecor:block/fence/steel_mesh_fence"
},
"elements": [
{
"from": [8, 15.625, 0.0625],
"to": [8.1875, 15.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 8, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 13.625, 0.0625],
"to": [8, 13.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, 6, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 9.625, 0.0625],
"to": [8, 9.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, 2, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 5.625, 0.0625],
"to": [8, 5.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, -2, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.8125, 1.625, 0.0625],
"to": [8, 1.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.0625, -6, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 11.625, 0.0625],
"to": [8.1875, 11.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 4, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 7.625, 0.0625],
"to": [8.1875, 7.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, 0, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [8, 3.625, 0.0625],
"to": [8.1875, 3.98, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8.25, -4, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 1.875],
"to": [8.125, 15.855, 2.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 9.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 0],
"to": [8.125, 15.855, 0.1875],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 8]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 7.8125],
"to": [8.125, 15.855, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 15.8125]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 3.875],
"to": [8.125, 15.855, 4.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 11.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
},
{
"from": [7.875, 0, 5.875],
"to": [8.125, 15.855, 6.25],
"rotation": {"angle": 0, "axis": "y", "origin": [7.75, 8, 13.875]},
"faces": {
"north": {"texture": "#wall", "cullface": "north"},
"east": {"texture": "#wall"},
"south": {"texture": "#wall"},
"west": {"texture": "#wall"},
"up": {"texture": "#wall"},
"down": {"texture": "#wall"}
}
}
]
}

113
1.14/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json Normal file
View file

@ -0,0 +1,113 @@
{
"parent": "block/cube",
"textures": {
"o": "engineersdecor:block/iestyle/treated_wood_rough_texture",
"particle": "engineersdecor:block/iestyle/treated_wood_rough_texture"
},
"elements": [
{
"from": [1.625, 8.625, 13],
"to": [3.375, 16, 14.625],
"rotation": {"angle": -45, "axis": "x", "origin": [2.5, 11, 13.125]},
"faces": {
"north": {"uv": [12.625, 0, 14.375, 7.375], "texture": "#o"},
"east": {"uv": [1.375, 0, 3, 7.375], "texture": "#o"},
"south": {"uv": [1.625, 0, 3.375, 7.375], "texture": "#o"},
"west": {"uv": [13, 0, 14.625, 7.375], "texture": "#o"}
}
},
{
"from": [12.625, 8.625, 13],
"to": [14.375, 16, 14.625],
"rotation": {"angle": -45, "axis": "x", "origin": [13.5, 11, 13.125]},
"faces": {
"north": {"uv": [1.625, 0, 3.375, 7.375], "texture": "#o"},
"east": {"uv": [1.375, 0, 3, 7.375], "texture": "#o"},
"south": {"uv": [12.625, 0, 14.375, 7.375], "texture": "#o"},
"west": {"uv": [13, 0, 14.625, 7.375], "texture": "#o"}
}
},
{
"from": [0, 14.5, 4],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [0, 0, 16, 1.5], "texture": "#o"},
"east": {"uv": [0, 0, 12, 1.5], "texture": "#o"},
"south": {"uv": [0, 0, 16, 1.5], "texture": "#o"},
"west": {"uv": [4, 0, 16, 1.5], "texture": "#o"},
"up": {"uv": [0, 4, 16, 16], "texture": "#o"},
"down": {"uv": [0, 0, 16, 12], "texture": "#o"}
}
},
{
"from": [1.5, 9, 14.375],
"to": [3.5, 15, 16],
"faces": {
"north": {"uv": [12.5, 1, 14.5, 7], "texture": "#o"},
"east": {"uv": [0, 1, 1.625, 7], "texture": "#o"},
"south": {"uv": [1.5, 1, 3.5, 7], "texture": "#o"},
"west": {"uv": [14.375, 1, 16, 7], "texture": "#o"},
"down": {"uv": [1.5, 0, 3.5, 1.625], "texture": "#o"}
}
},
{
"from": [3.5, 14, 14.375],
"to": [12.5, 15, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [10.25, 8, 8]},
"faces": {
"north": {"uv": [3.5, 1, 12.5, 2], "texture": "#o"},
"east": {"uv": [0, 1, 1.625, 2], "texture": "#o"},
"south": {"uv": [3.5, 1, 12.5, 2], "texture": "#o"},
"west": {"uv": [14.375, 1, 16, 2], "texture": "#o"},
"down": {"uv": [3.5, 0, 12.5, 1.625], "texture": "#o"}
}
},
{
"from": [1.5, 14, 5.5],
"to": [14.5, 15, 14.375],
"rotation": {"angle": 0, "axis": "y", "origin": [10.25, 8, 3]},
"faces": {
"north": {"uv": [1.5, 1, 14.5, 2], "texture": "#o"},
"east": {"uv": [1.625, 1, 10.5, 2], "texture": "#o"},
"south": {"uv": [1.5, 1, 14.5, 2], "texture": "#o"},
"west": {"uv": [5.5, 1, 14.375, 2], "texture": "#o"},
"down": {"uv": [1.5, 1.625, 14.5, 10.5], "texture": "#o"}
}
},
{
"from": [12.5, 9, 14.25],
"to": [14.5, 15, 16],
"faces": {
"north": {"uv": [1.5, 1, 3.5, 7], "texture": "#o"},
"east": {"uv": [0, 1, 1.75, 7], "texture": "#o"},
"south": {"uv": [12.5, 1, 14.5, 7], "texture": "#o"},
"west": {"uv": [14.25, 1, 16, 7], "texture": "#o"},
"down": {"uv": [12.5, 0, 14.5, 1.75], "texture": "#o"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [-8, 154, 97],
"translation": [-1.75, -1.75, -2.25],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_righthand": {
"rotation": [-2, -59, -46],
"translation": [0, -0.75, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.2, 0.2, 0.2]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0.75, -4.5, -3],
"scale": [0.7, 0.7, 0.7]
},
"fixed": {
"translation": [0, 0, -3.75],
"scale": [0.5, 0.5, 0.5]
}
}
}

1
1.14/src/main/resources/assets/engineersdecor/models/item/steel_mesh_fence.json Normal file
View file

@ -0,0 +1 @@
{ "parent": "engineersdecor:block/fence/steel_mesh_fence_inventory" }

1
1.14/src/main/resources/assets/engineersdecor/models/item/treated_wood_broad_windowsill.json Normal file
View file

@ -0,0 +1 @@
{ "parent": "engineersdecor:block/furniture/treated_wood_windowsill_broad_model" }

BIN
1.14/src/main/resources/assets/engineersdecor/textures/block/fence/steel_mesh_fence.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 388 B

BIN
1.14/src/main/resources/assets/engineersdecor/textures/block/fence/steel_mesh_pole_side.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 342 B

BIN
1.14/src/main/resources/assets/engineersdecor/textures/block/fence/steel_mesh_top.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 373 B

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "clinker_brick_block_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:clinker_brick_block"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_stained_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "clinker_brick_stained_block_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:clinker_brick_stained_block"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_stained_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "clinker_brick_stained_stairs_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:clinker_brick_stained_stairs"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "clinker_brick_stairs_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:clinker_brick_stairs"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/clinker_brick_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "clinker_brick_wall_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:clinker_brick_wall"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/concrete_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "concrete_wall_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:concrete_wall"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/iron_inset_light.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "iron_inset_light_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:iron_inset_light"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/metal_rung_ladder.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "metal_rung_ladder_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:metal_rung_ladder"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/metal_rung_steps.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "metal_rung_steps_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:metal_rung_steps"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/panzerglass_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "panzerglass_block_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:panzerglass_block"
}
]
}
]
}

26
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/passive_fluid_accumulator.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "passive_fluid_accumulator_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
},
{
"function": "minecraft:copy_nbt",
"source": "block_entity",
"ops": []
}
],
"name": "engineersdecor:passive_fluid_accumulator"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/rebar_concrete.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "rebar_concrete_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:rebar_concrete"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/rebar_concrete_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "rebar_concrete_stairs_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:rebar_concrete_stairs"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/rebar_concrete_tile.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "rebar_concrete_tile_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:rebar_concrete_tile"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/rebar_concrete_tile_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "rebar_concrete_tile_stairs_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:rebar_concrete_tile_stairs"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/rebar_concrete_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "rebar_concrete_wall_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:rebar_concrete_wall"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_danger.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_danger_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_danger"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_decor.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_decor_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_decor"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_defense.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_defense_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_defense"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_exit.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_exit_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_exit"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_factoryarea.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_factoryarea_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_factoryarea"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/sign_hotwire.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "sign_hotwire_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:sign_hotwire"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/slag_brick_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "slag_brick_block_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:slag_brick_block"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/slag_brick_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "slag_brick_stairs_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:slag_brick_stairs"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/slag_brick_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "slag_brick_wall_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:slag_brick_wall"
}
]
}
]
}

26
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/small_solar_panel.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "small_solar_panel_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
},
{
"function": "minecraft:copy_nbt",
"source": "block_entity",
"ops": []
}
],
"name": "engineersdecor:small_solar_panel"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_double_t_support.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "steel_double_t_support_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:steel_double_t_support"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_floor_grating.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "steel_floor_grating_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:steel_floor_grating"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_framed_window.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "steel_framed_window_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:steel_framed_window"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_mesh_fence.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "steel_mesh_fence_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:steel_mesh_fence"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/steel_table.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "steel_table_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:steel_table"
}
]
}
]
}

26
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/straight_pipe_valve.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "straight_pipe_valve_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
},
{
"function": "minecraft:copy_nbt",
"source": "block_entity",
"ops": []
}
],
"name": "engineersdecor:straight_pipe_valve"
}
]
}
]
}

26
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/straight_pipe_valve_redstone.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "straight_pipe_valve_redstone_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
},
{
"function": "minecraft:copy_nbt",
"source": "block_entity",
"ops": []
}
],
"name": "engineersdecor:straight_pipe_valve_redstone"
}
]
}
]
}

26
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/straight_pipe_valve_redstone_analog.json Normal file
View file

@ -0,0 +1,26 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "straight_pipe_valve_redstone_analog_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
},
{
"function": "minecraft:copy_nbt",
"source": "block_entity",
"ops": []
}
],
"name": "engineersdecor:straight_pipe_valve_redstone_analog"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/thick_steel_pole.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "thick_steel_pole_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:thick_steel_pole"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/thick_steel_pole_head.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "thick_steel_pole_head_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:thick_steel_pole_head"
}
]
}
]
}

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/thin_steel_pole.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"name": "thin_steel_pole_dlt",
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:copy_name",
"source": "block_entity"
}
],
"name": "engineersdecor:thin_steel_pole"
}
]
}
]
}

Some files were not shown because too many files have changed in this diff Show more