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

Fixed typo in en-en. Window rendering using multi-layer. Creative tab symbol changed to mod logo. Alternative recipes for crafting table and furnace if IE is not installed. IE concrete texture missing log bail fixed.

Browse source
This commit is contained in:
stfwi 2019-04-09 22:10:02 +02:00
parent d93af084f2
commit e08e508f00
31 changed files with 411 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ public class ModEngineersDecor
@Override
@SideOnly(Side.CLIENT)
public @Nonnull ItemStack createIcon()
{ return new ItemStack(ModBlocks.TREATED_WOOD_LADDER); }
{ return new ItemStack(ModBlocks.SIGN_MODLOGO); }
});
//--------------------------------------------------------------------------------------------------------------------

5
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java
View file

@ -32,6 +32,11 @@ public class BlockDecorWindow extends BlockDecorDirected
public BlockRenderLayer getRenderLayer()
{ return BlockRenderLayer.TRANSLUCENT; }
@Override
@SideOnly(Side.CLIENT)
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{ return (layer==BlockRenderLayer.CUTOUT) || (layer==BlockRenderLayer.TRANSLUCENT); }
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side)

10
1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java
View file

@ -134,6 +134,13 @@ public class ModBlocks
ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16.0)
);
public static final BlockDecorDirected SIGN_MODLOGO = new BlockDecorDirected(
"sign_decor",
BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
Material.WOOD, 0.1f, 1000f, SoundType.WOOD,
ModAuxiliaries.getPixeledAABB(0,0,15.6, 16,16,16.0)
);
private static final Block modBlocks[] = {
TREATED_WOOD_CRAFTING_TABLE,
CLINKER_BRICK_BLOCK,
@ -161,7 +168,8 @@ public class ModBlocks
SMALL_LAB_FURNACE,
STEEL_FRAMED_WINDOW,
TREATED_WOOD_POLE_SUPPORT,
TREATED_WOOD_POLE_HEAD
TREATED_WOOD_POLE_HEAD,
SIGN_MODLOGO
};
private static final Block devBlocks[] = {

1
1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java
View file

@ -219,6 +219,7 @@ public class ModConfig
public static final boolean isOptedOut(final @Nullable Block block)
{
if((block == null) || (optout==null)) return true;
if(block == ModBlocks.SIGN_MODLOGO) return true;
final String rn = block.getRegistryName().getPath();
if(optout.without_clinker_bricks && rn.startsWith("clinker_brick_")) return true;
if(optout.without_slag_bricks && rn.startsWith("slag_brick_")) return true;

11
1.12/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java
View file

@ -55,15 +55,16 @@ public class RecipeCondModSpecific implements IConditionFactory
}
final JsonArray missing = json.getAsJsonArray("missing");
if((missing!=null) && (missing.size() > 0)) {
int num_missing = 0;
for(JsonElement e: missing) {
if(!e.isJsonPrimitive()) continue;
final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString());
// At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item.
// --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there
// is no slag.
if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return exclude();
if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) ++num_missing;
}
return exclude(); // all required there, but there is no item missing, so another recipe
// At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item.
// --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there
// is no slag.
return (num_missing == 0) ? (exclude()) : (RECIPE_INCLUDE);
} else {
return RECIPE_INCLUDE; // no missing given, means include if result and required are all there.
}