diff --git a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java index b6ba8b0c8..3c67dafb5 100644 --- a/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java +++ b/src/main/java/forestry/apiculture/worldgen/VillageApiaristHouse.java @@ -15,27 +15,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoor; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.BlockLog; -import net.minecraft.block.BlockSlab; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockTorch; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.structure.StructureBoundingBox; -import net.minecraft.world.gen.structure.StructureComponent; -import net.minecraft.world.gen.structure.StructureVillagePieces; - -import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; -import net.minecraftforge.fml.common.registry.VillagerRegistry; - import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; @@ -62,6 +41,25 @@ import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.tiles.TileUtil; import forestry.plugins.ForestryPluginUids; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockHorizontal; +import net.minecraft.block.BlockLog; +import net.minecraft.block.BlockSlab; +import net.minecraft.block.BlockStairs; +import net.minecraft.block.BlockTorch; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.structure.StructureBoundingBox; +import net.minecraft.world.gen.structure.StructureComponent; +import net.minecraft.world.gen.structure.StructureVillagePieces; +import net.minecraftforge.fml.common.registry.FMLControlledNamespacedRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry; public class VillageApiaristHouse extends StructureVillagePieces.House1 { @@ -88,13 +86,15 @@ public class VillageApiaristHouse extends StructureVillagePieces.House1 { } private void createBuildingBlocks(Random random) { - boolean fireproof = random.nextInt(4) == 0; IWoodType woodType; + boolean fireproof; if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.ARBORICULTURE)) { woodType = EnumForestryWoodType.getRandom(random); + fireproof = random.nextInt(4) == 0; } else { woodType = EnumVanillaWoodType.getRandom(random); + fireproof = false; } IWoodAccess woodAccess = TreeManager.woodAccess; diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 90787ef98..c37c0ac23 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -148,6 +148,14 @@ public class PluginArboriculture extends BlankForestryPlugin { CapabilityManager.INSTANCE.register(IArmorNaturalist.class, new NullStorage<>(), () -> ArmorNaturalist.INSTANCE); } + @Override + public void disabledSetupAPI() { + TreeManager.woodAccess = new WoodAccess(); + + // Capabilities + CapabilityManager.INSTANCE.register(IArmorNaturalist.class, new NullStorage<>(), () -> ArmorNaturalist.INSTANCE); + } + @Override public void registerItemsAndBlocks() { items = new ItemRegistryArboriculture(); diff --git a/src/main/java/forestry/arboriculture/WoodAccess.java b/src/main/java/forestry/arboriculture/WoodAccess.java index 6a721bae9..e833d326a 100644 --- a/src/main/java/forestry/arboriculture/WoodAccess.java +++ b/src/main/java/forestry/arboriculture/WoodAccess.java @@ -11,7 +11,6 @@ package forestry.arboriculture; import javax.annotation.Nonnull; - import java.util.ArrayList; import java.util.Arrays; import java.util.EnumMap; @@ -19,16 +18,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.block.BlockNewLog; -import net.minecraft.block.BlockOldLog; -import net.minecraft.block.BlockPlanks; -import net.minecraft.block.BlockWoodSlab; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - import forestry.api.arboriculture.EnumVanillaWoodType; import forestry.api.arboriculture.IWoodAccess; import forestry.api.arboriculture.IWoodType; @@ -41,7 +30,15 @@ import forestry.arboriculture.blocks.log.BlockForestryLog; import forestry.arboriculture.blocks.planks.BlockForestryPlanks; import forestry.arboriculture.blocks.property.PropertyWoodType; import forestry.arboriculture.blocks.slab.BlockForestrySlab; -import forestry.core.utils.Log; +import net.minecraft.block.Block; +import net.minecraft.block.BlockNewLog; +import net.minecraft.block.BlockOldLog; +import net.minecraft.block.BlockPlanks; +import net.minecraft.block.BlockWoodSlab; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class WoodAccess implements IWoodAccess { private static final Map woodMaps = new EnumMap<>(WoodBlockKind.class); @@ -242,8 +239,8 @@ public class WoodAccess implements IWoodAccess { WoodMap woodMap = woodMaps.get(woodBlockKind); ItemStack itemStack = woodMap.getItem(fireproof).get(woodType); if (itemStack == null) { - Log.error("No stack found for {} {} {}", woodType, woodMap.getName(), fireproof ? "fireproof" : ""); - return null; + String errMessage = String.format("No stack found for %s %s %s", woodType, woodMap.getName(), fireproof ? "fireproof" : "non-fireproof"); + throw new IllegalStateException(errMessage); } return itemStack.copy(); } @@ -256,8 +253,8 @@ public class WoodAccess implements IWoodAccess { WoodMap woodMap = woodMaps.get(woodBlockKind); IBlockState blockState = woodMap.getBlock(fireproof).get(woodType); if (blockState == null) { - Log.error("No block found for {} {} {}", woodType, woodMap.getName(), fireproof ? "fireproof" : "non-fireproof"); - return null; + String errMessage = String.format("No block found for %s %s %s", woodType, woodMap.getName(), fireproof ? "fireproof" : "non-fireproof"); + throw new IllegalStateException(errMessage); } return blockState; }