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

Added IE concrete wall. Fixed missing rebar concrete wall recipe.

Browse source
This commit is contained in:
stfwi 2019-02-18 21:34:29 +01:00
parent 746ca98e91
commit 0141971f39
9 changed files with 94 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ import javax.annotation.Nonnull;
modid = ModEngineersDecor.MODID,
name = ModEngineersDecor.MODNAME,
version = ModEngineersDecor.MODVERSION,
dependencies = "required-after:forge@[14.23.5.2768,)",
dependencies = "required-after:forge@[14.23.5.2768,);before:immersiveengineering",
useMetadata = true,
updateJSON = "https://raw.githubusercontent.com/stfwi/engineersdecor/develop/meta/update.json",
certificateFingerprint = ((ModEngineersDecor.MODFINGERPRINT==("@"+"MOD_SIGNSHA1"+"@")) ? "" : ModEngineersDecor.MODFINGERPRINT)

11
src/main/java/wile/engineersdecor/blocks/ModBlocks.java
View file

@ -16,6 +16,7 @@ import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.Loader;
import wile.engineersdecor.ModEngineersDecor;
import wile.engineersdecor.detail.ModAuxiliaries;
import wile.engineersdecor.detail.ModConfig;
@ -50,6 +51,8 @@ public class ModBlocks
public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = new BlockDecorStairs("rebar_concrete_stairs", REBAR_CONCRETE_BLOCK.getDefaultState());
public static final BlockDecorWall REBAR_CONCRETE_WALL = new BlockDecorWall("rebar_concrete_wall", BlockDecor.CFG_WALL_DOOR_CONNECTION, Material.ROCK, 8f, 2000f, SoundType.STONE);
public static final BlockDecorWall CONCRETE_WALL = new BlockDecorWall("concrete_wall", BlockDecor.CFG_WALL_DOOR_CONNECTION, Material.ROCK, 8f, 50f, SoundType.STONE);
public static final BlockDecorDirected TREATED_WOOD_POLE = new BlockDecorDirected(
"treated_wood_pole",
BlockDecor.CFG_CUTOUT,
@ -80,6 +83,10 @@ public class ModBlocks
REBAR_CONCRETE_WALL,
};
private static final Block ieDependentBlocks[] = {
CONCRETE_WALL
};
private static final Block devBlocks[] = {
IRON_SHEET_ROOF, // model looks not good enough yet
};
@ -96,6 +103,10 @@ public class ModBlocks
// Config based registry selection
ArrayList<Block> allBlocks = new ArrayList<>();
Collections.addAll(allBlocks, modBlocks);
if(Loader.isModLoaded("immersiveengineering")) {
ModEngineersDecor.logger.info("Immersive Engineering installed, registering dependent blocks...");
Collections.addAll(allBlocks, ieDependentBlocks);
}
if(ModConfig.zmisc.with_experimental) Collections.addAll(allBlocks, devBlocks);
for(Block e:allBlocks) registeredBlocks.add(e);
for(Block e:registeredBlocks) event.getRegistry().register(e);

17
src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json Normal file
View file

@ -0,0 +1,17 @@
{
"forge_marker": 1,
"defaults": {
"textures": {
"wall": "immersiveengineering:blocks/stone_decoration_concrete",
"particle": "immersiveengineering:blocks/stone_decoration_concrete"
}
},
"variants": {
"inventory": { "model": "engineersdecor:wall/concrete_wall_inventory" },
"up" : { "false":{}, "true": {"submodel": {"concrete_wall_up" : {"model": "engineersdecor:wall/concrete_wall_post" }}} },
"north": { "false":{}, "true": {"submodel": {"concrete_wall_north" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 0 }}} },
"east" : { "false":{}, "true": {"submodel": {"concrete_wall_east" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 90 }}} },
"south": { "false":{}, "true": {"submodel": {"concrete_wall_south" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 180 }}} },
"west" : { "false":{}, "true": {"submodel": {"concrete_wall_west" : {"model": "engineersdecor:wall/concrete_wall_side", "uvlock": true, "y": 270 }}} }
}
}

2
src/main/resources/assets/engineersdecor/lang/en_us.lang
View file

@ -20,6 +20,8 @@ tile.engineersdecor.rebar_concrete.name=Rebar concrete
tile.engineersdecor.rebar_concrete.help=§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.
tile.engineersdecor.rebar_concrete_wall.name=Rebar concrete wall
tile.engineersdecor.rebar_concrete_wall.help=§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.
tile.engineersdecor.concrete_wall.name=Concrete wall
tile.engineersdecor.concrete_wall.help=§6Wall made of solid concrete.
#-----------------------------------------------------------------------------------------------------------
# Ladder blocks

25
src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_with_ie_installed.json Normal file
View file

@ -0,0 +1,25 @@
{
"conditions": [
{
"type": "engineersdecor:grc",
"result": "engineersdecor:concrete_wall",
"required": ["immersiveengineering:stone_decoration"]
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
" ",
"CCC",
"CCC"
],
"key": {
"C": {
"item": "#blockConcreteIe",
"data": 0
}
},
"result": {
"item": "engineersdecor:concrete_wall",
"count": 6
}
}

24
src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json Normal file
View file

@ -0,0 +1,24 @@
{
"conditions": [
{
"type": "engineersdecor:grc",
"result": "engineersdecor:rebar_concrete_wall"
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
" ",
"CCC",
"CCC"
],
"key": {
"C": {
"item": "engineersdecor:rebar_concrete",
"data": 0
}
},
"result": {
"item": "engineersdecor:rebar_concrete_wall",
"count": 6
}
}