Flatten Quarried Stone and fix a few issues.

Railcraft · Aug 28, 2020 · 919dbd5 · 919dbd5
1 parent a0c8f61
commit 919dbd5
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 30 deletions.
diff --git a/lang b/lang
diff --git a/src/main/java/mods/railcraft/common/blocks/RailcraftBlocks.java b/src/main/java/mods/railcraft/common/blocks/RailcraftBlocks.java
@@ -16,7 +16,6 @@
 import mods.railcraft.common.blocks.aesthetics.brick.*;
 import mods.railcraft.common.blocks.aesthetics.concrete.BlockReinforcedConcrete;
 import mods.railcraft.common.blocks.aesthetics.generic.BlockGeneric;
-import mods.railcraft.common.blocks.aesthetics.generic.EnumGeneric;
 import mods.railcraft.common.blocks.aesthetics.generic.ItemBlockGeneric;
 import mods.railcraft.common.blocks.aesthetics.glass.BlockStrengthGlass;
 import mods.railcraft.common.blocks.aesthetics.materials.BlockLantern;
@@ -108,6 +107,11 @@ public enum RailcraftBlocks implements IRailcraftBlockContainer {
 
     ABYSSAL_STONE(BlockDef.build("abyssal_stone", BlockRailcraftStone.class)
             .block(() -> new BlockRailcraftStone(MapColor.BLACK))
+            .defaultItem()
+    ),
+    QUARRIED_STONE(BlockDef.build("quarried_stone", BlockRailcraftStone.class)
+            .block(() -> new BlockRailcraftStone(MapColor.SNOW))
+            .defaultItem()
     ),
 
     // Bricks
@@ -121,7 +125,7 @@ public enum RailcraftBlocks implements IRailcraftBlockContainer {
     INFERNAL_BRICK(BlockDef.build("infernal_brick", BlockBrick.class).block(() -> new BlockBrick(BrickTheme.INFERNAL)).defaultSubtypedItem()),
     PEARLIZED_BRICK(BlockDef.build("pearlized_brick", BlockBrick.class).block(() -> new BlockBrick(BrickTheme.PEARLIZED)).defaultSubtypedItem()),
     QUARRIED_BRICK(BlockDef.build("quarried_brick", BlockBrick.class).block(() -> new BlockBrick(BrickTheme.QUARRIED)).defaultSubtypedItem()
-            .condition(EnumGeneric.STONE_QUARRIED)
+            .condition(QUARRIED_STONE)
     ),
     BADLANDS_BRICK(BlockDef.build("badlands_brick", BlockBrick.class).block(() -> new BlockBrick(BrickTheme.BADLANDS)).defaultSubtypedItem()),
     SANDY_BRICK(BlockDef.build("sandy_brick", BlockBrick.class).block(() -> new BlockBrick(BrickTheme.SANDY)).defaultSubtypedItem()),
@@ -302,13 +306,13 @@ public enum RailcraftBlocks implements IRailcraftBlockContainer {
     QUARRIED_BRICK_STAIRS(BlockDef.build("quarried_brick_stairs", BlockBrickStairs.class)
             .block(() -> new BlockBrickStairs(BrickTheme.QUARRIED, BrickVariant.BRICK))
             .defaultItem()
-            .condition(EnumGeneric.STONE_QUARRIED)
+            .condition(QUARRIED_STONE)
             .condition(QUARRIED_BRICK)
     ),
     QUARRIED_PAVER_STAIRS(BlockDef.build("quarried_paver_stairs", BlockBrickStairs.class)
             .block(() -> new BlockBrickStairs(BrickTheme.QUARRIED, BrickVariant.PAVER))
             .defaultItem()
-            .condition(EnumGeneric.STONE_QUARRIED)
+            .condition(QUARRIED_STONE)
             .condition(QUARRIED_BRICK)
     ),
     SANDY_BRICK_STAIRS(BlockDef.build("sandy_brick_stairs", BlockBrickStairs.class)

diff --git a/src/main/java/mods/railcraft/common/blocks/aesthetics/brick/BrickTheme.java b/src/main/java/mods/railcraft/common/blocks/aesthetics/brick/BrickTheme.java
@@ -13,7 +13,6 @@
 import mods.railcraft.api.crafting.Crafters;
 import mods.railcraft.common.blocks.IRailcraftBlock;
 import mods.railcraft.common.blocks.RailcraftBlocks;
-import mods.railcraft.common.blocks.aesthetics.generic.EnumGeneric;
 import mods.railcraft.common.core.IRailcraftObjectContainer;
 import mods.railcraft.common.items.ItemDust.EnumDust;
 import mods.railcraft.common.items.RailcraftItems;
@@ -90,10 +89,10 @@ public void initRecipes(BlockBrick block) {
     QUARRIED(RailcraftBlocks.QUARRIED_BRICK, MapColor.SNOW) {
         @Override
         public void initRecipes(BlockBrick block) {
-            if (EnumGeneric.STONE_QUARRIED.isEnabled()) {
-                CraftingPlugin.addFurnaceRecipe(EnumGeneric.STONE_QUARRIED.getStack(), block.getStack(POLISHED), 0.05f);
+            if (RailcraftBlocks.QUARRIED_STONE.isEnabled()) {
+                CraftingPlugin.addFurnaceRecipe(RailcraftBlocks.QUARRIED_STONE.getStack(), block.getStack(POLISHED), 0.05f);
                 if (COBBLE.isEnabled()) {
-                    Crafters.rockCrusher().makeRecipe(EnumGeneric.STONE_QUARRIED)
+                    Crafters.rockCrusher().makeRecipe(RailcraftBlocks.QUARRIED_STONE)
                             .name("railcraft:stone_quarried")
                             .addOutput(getStack(COBBLE))
                             .register();

diff --git a/src/main/java/mods/railcraft/common/blocks/aesthetics/generic/BlockGeneric.java b/src/main/java/mods/railcraft/common/blocks/aesthetics/generic/BlockGeneric.java
@@ -14,7 +14,6 @@
 import mods.railcraft.common.blocks.BlockRailcraftSubtyped;
 import mods.railcraft.common.blocks.RailcraftBlocks;
 import mods.railcraft.common.carts.EntityTunnelBore;
-import mods.railcraft.common.plugins.forestry.ForestryPlugin;
 import mods.railcraft.common.plugins.forge.CreativePlugin;
 import mods.railcraft.common.plugins.forge.HarvestPlugin;
 import mods.railcraft.common.plugins.forge.WorldPlugin;
@@ -59,14 +58,10 @@ public BlockGeneric() {
 
     @Override
     public void initializeDefinition() {
-        HarvestPlugin.setStateHarvestLevel("pickaxe", 1, EnumGeneric.STONE_QUARRIED);
-
         HarvestPlugin.setStateHarvestLevel("shovel", 3, EnumGeneric.CRUSHED_OBSIDIAN);
 
         EntityTunnelBore.addMineableBlock(this);
 
-        ForestryPlugin.addBackpackItem("forestry.digger", EnumGeneric.STONE_QUARRIED.getStack());
-
         for (EnumGeneric block : EnumGeneric.VALUES) {
             MicroBlockPlugin.addMicroBlockCandidate(this, block.ordinal());
         }
@@ -201,6 +196,9 @@ public void randomTick(World worldIn, BlockPos pos, IBlockState state, Random ra
             case STONE_ABYSSAL:
                 newState = RailcraftBlocks.ABYSSAL_STONE.getDefaultState();
                 break;
+            case STONE_QUARRIED:
+                newState = RailcraftBlocks.QUARRIED_STONE.getDefaultState();
+                break;
             case BLOCK_CONCRETE:
                 newState = RailcraftBlocks.REINFORCED_CONCRETE.getDefaultState();
                 break;

diff --git a/src/main/java/mods/railcraft/common/blocks/aesthetics/generic/EnumGeneric.java b/src/main/java/mods/railcraft/common/blocks/aesthetics/generic/EnumGeneric.java
@@ -44,6 +44,7 @@ public enum EnumGeneric implements IVariantEnumBlock<EnumGeneric> {
     CRUSHED_OBSIDIAN(ModuleResources.class, "crushed_obsidian", new CrushedObsidian(), 2f, 45f),
     @Deprecated
     STONE_ABYSSAL(ModuleWorld.class, "stone_abyssal", new SimpleCube(), 2f, 10f),
+    @Deprecated
     STONE_QUARRIED(ModuleWorld.class, "stone_quarried", new SimpleCube(), 2f, 10f),
     @Deprecated
     BLOCK_SILVER(ModuleResources.class, "silver", new SimpleCube(), 3f, 10f),
@@ -63,7 +64,6 @@ public enum EnumGeneric implements IVariantEnumBlock<EnumGeneric> {
 
     static {
         creativeList.add(CRUSHED_OBSIDIAN);
-        creativeList.add(STONE_QUARRIED);
     }
 
     private final SimpleCube blockDef;

diff --git a/src/main/java/mods/railcraft/common/core/RailcraftConfig.java b/src/main/java/mods/railcraft/common/core/RailcraftConfig.java
@@ -285,7 +285,6 @@ private static void loadRecipeOption() {
         loadRecipeProperty("ic2.macerator", "cobble", true, "change to '{t}=false' to disable the IC2 Macerator recipes involving Cobblestone");
         loadRecipeProperty("ic2.macerator", "dirt", true, "change to '{t}=false' to disable the IC2 Macerator recipe for Dirt");
         loadRecipeProperty("ic2.macerator", "slag", true, "change to '{t}=false' to disable the IC2 Macerator recipe for Slag Dust");
-        loadRecipeProperty("ic2.macerator", "ender", true, "change to '{t}=false' to disable the IC2 Macerator recipe for Ender Powder");
         loadRecipeProperty("forestry.misc", "fertilizer", true, "change to '{t}=false' to disable the saltpeter recipe for Forestry Fertilizer");
         loadRecipeProperty("forestry.misc", "brass.casing", true, "change to '{t}=false' to disable the brass recipe for Forestry Sturdy Casing");
         loadRecipeProperty("forestry.carpenter", "ties", true, "change to '{t}=false' to disable the Carpenter Tie recipe");

diff --git a/src/main/java/mods/railcraft/common/items/ItemDust.java b/src/main/java/mods/railcraft/common/items/ItemDust.java
@@ -57,9 +57,6 @@ public void finalizeDefinition() {
             if (RailcraftConfig.getRecipeConfig("ic2.macerator.charcoal")) {
                 IC2Plugin.addMaceratorRecipe(new ItemStack(Items.COAL, 1, 1), getStack(EnumDust.CHARCOAL));
             }
-            if (RailcraftConfig.getRecipeConfig("ic2.macerator.ender")) {
-                IC2Plugin.addMaceratorRecipe(new ItemStack(Items.ENDER_PEARL), getStack(EnumDust.ENDER));
-            }
             if (!Mod.IC2_CLASSIC.isLoaded()) {
                 if (RailcraftConfig.getRecipeConfig("ic2.macerator.slag")) {
                     IC2Plugin.addMaceratorRecipe(ModItems.SLAG.getStack(), getStack(EnumDust.SLAG));

diff --git a/src/main/java/mods/railcraft/common/modules/ModuleBuilding.java b/src/main/java/mods/railcraft/common/modules/ModuleBuilding.java
@@ -19,7 +19,9 @@
 import mods.railcraft.common.plugins.forge.CraftingPlugin;
 import net.minecraft.item.ItemStack;
 
-@RailcraftModule(value = "railcraft:building", description = "glass, posts, bricks, stairs, slabs, lanterns, walls")
+@RailcraftModule(value = "railcraft:building",
+        softDependencyClasses = ModuleWorld.class,
+        description = "glass, posts, bricks, stairs, slabs, lanterns, walls")
 public class ModuleBuilding extends RailcraftModulePayload {
 
     public ModuleBuilding() {

diff --git a/src/main/java/mods/railcraft/common/modules/ModuleWorld.java b/src/main/java/mods/railcraft/common/modules/ModuleWorld.java
@@ -11,7 +11,6 @@
 
 import mods.railcraft.api.core.RailcraftModule;
 import mods.railcraft.common.blocks.RailcraftBlocks;
-import mods.railcraft.common.blocks.aesthetics.generic.EnumGeneric;
 import mods.railcraft.common.blocks.ore.EnumOre;
 import mods.railcraft.common.blocks.ore.EnumOreMagic;
 import mods.railcraft.common.core.Railcraft;
@@ -58,6 +57,7 @@ public class ModuleWorld extends RailcraftModulePayload {
     public ModuleWorld() {
         add(
                 RailcraftBlocks.ABYSSAL_STONE,
+                RailcraftBlocks.QUARRIED_STONE,
                 RailcraftBlocks.GENERIC,
                 RailcraftBlocks.ORE,
                 RailcraftBlocks.ORE_METAL,
@@ -81,7 +81,7 @@ public void preInit() {
                     GameRegistry.registerWorldGenerator(new GeneratorFirestone(), 100);
                 if (RailcraftConfig.isWorldGenEnabled("abyssal") && RailcraftBlocks.ABYSSAL_STONE.isEnabled())
                     GameRegistry.registerWorldGenerator(new GeneratorGeode(), 0);
-                if (RailcraftConfig.isWorldGenEnabled("quarried") && EnumGeneric.STONE_QUARRIED.isEnabled())
+                if (RailcraftConfig.isWorldGenEnabled("quarried") && RailcraftBlocks.QUARRIED_STONE.isEnabled())
                     MinecraftForge.EVENT_BUS.register(PopulatorQuarry.instance());
 
                 oreConfigFolder = new File(Railcraft.instance.getConfigFolder(), "ores");

diff --git a/src/main/java/mods/railcraft/common/worldgen/PopulatorQuarry.java b/src/main/java/mods/railcraft/common/worldgen/PopulatorQuarry.java
@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------------
- Copyright (c) CovertJaguar, 2011-2019
+ Copyright (c) CovertJaguar, 2011-2020
  http://railcraft.info
 
  This code is the property of CovertJaguar
@@ -9,7 +9,7 @@
  -----------------------------------------------------------------------------*/
 package mods.railcraft.common.worldgen;
 
-import mods.railcraft.common.blocks.aesthetics.generic.EnumGeneric;
+import mods.railcraft.common.blocks.RailcraftBlocks;
 import mods.railcraft.common.plugins.forge.WorldPlugin;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.math.BlockPos;
@@ -28,7 +28,7 @@ public final class PopulatorQuarry extends Populator {
     //    public static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "RAILCRAFT_QUARRY", new Class[0]);
     public static final int GEN_HEIGHT = 50;
     private static PopulatorQuarry instance;
-    private final WorldGenQuarry quarry = new WorldGenQuarry(EnumGeneric.STONE_QUARRIED.getDefaultState());
+    private final WorldGenQuarry quarry = new WorldGenQuarry(RailcraftBlocks.QUARRIED_STONE.getDefaultState());
 
     public static PopulatorQuarry instance() {
         if (instance == null) {

diff --git a/src/main/resources/assets/railcraft/blockstates/abyssal_stone.json b/src/main/resources/assets/railcraft/blockstates/abyssal_stone.json
@@ -0,0 +1,11 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {"all": "railcraft:blocks/abyssal_stone"}
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{"transform": "forge:default-block"}]
+  }
+}
diff --git a/src/main/resources/assets/railcraft/blockstates/generic.json b/src/main/resources/assets/railcraft/blockstates/generic.json
@@ -10,8 +10,8 @@
     "variant": {
       "coke": {"textures": {"all": "railcraft:blocks/coke_block"}},
       "crushed_obsidian": {"textures": {"all": "railcraft:blocks/crushed_obsidian"}},
-      "stone_abyssal": {"textures": {"all": "railcraft:blocks/stone_abyssal"}},
-      "stone_quarried": {"textures": {"all": "railcraft:blocks/stone_quarried"}},
+      "stone_abyssal": {"textures": {"all": "railcraft:blocks/abyssal_stone"}},
+      "stone_quarried": {"textures": {"all": "railcraft:blocks/quarried_stone"}},
       "creosote": {"textures": {"all": "railcraft:blocks/creosote_block"}},
       "concrete": {"textures": {"all": "railcraft:blocks/concrete"}},
       "copper": {"textures": {"all": "railcraft:blocks/metal_copper"}},

diff --git a/src/main/resources/assets/railcraft/blockstates/ore.json b/src/main/resources/assets/railcraft/blockstates/ore.json
@@ -9,9 +9,9 @@
     "variant": {
       "sulfur": {"textures": {"stone": "blocks/stone", "ore": "railcraft:blocks/ore_sulfur"}},
       "saltpeter": {"textures": {"stone": "blocks/sandstone_bottom", "ore": "railcraft:blocks/ore_saltpeter"}},
-      "dark_diamond": {"textures": {"stone": "railcraft:blocks/stone_abyssal", "ore": "railcraft:blocks/ore_dark_diamond"}},
-      "dark_emerald": {"textures": {"stone": "railcraft:blocks/stone_abyssal", "ore": "railcraft:blocks/ore_dark_emerald"}},
-      "dark_lapis": {"textures": {"stone": "railcraft:blocks/stone_abyssal", "ore": "railcraft:blocks/ore_dark_lapis"}},
+      "dark_diamond": {"textures": {"stone": "railcraft:blocks/abyssal_stone", "ore": "railcraft:blocks/ore_dark_diamond"}},
+      "dark_emerald": {"textures": {"stone": "railcraft:blocks/abyssal_stone", "ore": "railcraft:blocks/ore_dark_emerald"}},
+      "dark_lapis": {"textures": {"stone": "railcraft:blocks/abyssal_stone", "ore": "railcraft:blocks/ore_dark_lapis"}},
       "poor_iron": {"textures": {"stone": "blocks/stone", "ore": "railcraft:blocks/ore_poor_iron"}},
       "poor_gold": {"textures": {"stone": "blocks/stone", "ore": "railcraft:blocks/ore_poor_gold"}},
       "poor_copper": {"textures": {"stone": "blocks/stone", "ore": "railcraft:blocks/ore_poor_copper"}},

diff --git a/src/main/resources/assets/railcraft/blockstates/quarried_stone.json b/src/main/resources/assets/railcraft/blockstates/quarried_stone.json
@@ -0,0 +1,11 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "cube_all",
+    "textures": {"all": "railcraft:blocks/quarried_stone"}
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{"transform": "forge:default-block"}]
+  }
+}
diff --git a/...ilcraft/textures/blocks/stone_abyssal.png → ...ilcraft/textures/blocks/abyssal_stone.png b/...ilcraft/textures/blocks/stone_abyssal.png → ...ilcraft/textures/blocks/abyssal_stone.png
diff --git a/...lcraft/textures/blocks/stone_quarried.png → ...lcraft/textures/blocks/quarried_stone.png b/...lcraft/textures/blocks/stone_quarried.png → ...lcraft/textures/blocks/quarried_stone.png