From 550b0dc3f5bc4650193851b645c484eaa4a96554 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 10 Jul 2016 19:28:11 -0700 Subject: [PATCH] Add zombie villager textures --- .../forestry/apiculture/PluginApiculture.java | 59 +++++++++--------- .../arboriculture/PluginArboriculture.java | 2 +- .../java/forestry/core/config/Constants.java | 2 + .../textures/entity/zombie_beekeeper.png | Bin 0 -> 2512 bytes .../textures/entity/zombie_lumberjack.png | Bin 0 -> 2518 bytes 5 files changed, 31 insertions(+), 32 deletions(-) create mode 100644 src/main/resources/assets/forestry/textures/entity/zombie_beekeeper.png create mode 100644 src/main/resources/assets/forestry/textures/entity/zombie_lumberjack.png diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index db9beed12..ab18c6af6 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.apiculture; -import com.google.common.collect.ImmutableMap; - import java.io.File; import java.util.ArrayList; import java.util.List; @@ -19,34 +17,7 @@ import java.util.Objects; import java.util.Random; import java.util.Set; -import net.minecraft.block.BlockFlower; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.storage.loot.LootTableList; - -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.VillagerRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - +import com.google.common.collect.ImmutableMap; import forestry.Forestry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; @@ -119,6 +90,32 @@ import forestry.food.items.ItemRegistryFood; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.IChunkGenerator; +import net.minecraft.world.storage.loot.LootTableList; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; @ForestryPlugin(pluginID = ForestryPluginUids.APICULTURE, name = "Apiculture", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.apiculture.description") public class PluginApiculture extends BlankForestryPlugin { @@ -266,7 +263,7 @@ public class PluginApiculture extends BlankForestryPlugin { VillagerRegistry villagerRegistry = VillagerRegistry.instance(); villagerRegistry.registerVillageCreationHandler(villageHandler); - villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER); + villagerApiarist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_APIARIST, Constants.TEXTURE_SKIN_BEEKPEEPER, Constants.TEXTURE_SKIN_ZOMBIE_BEEKPEEPER); villagerRegistry.register(villagerApiarist); ItemStack wildcardPrincess = new ItemStack(items.beePrincessGE, 1); diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 8d7febdea..ce175fe3d 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -198,7 +198,7 @@ public class PluginArboriculture extends BlankForestryPlugin { blocks.treeChest.init(); if (Config.enableVillagers) { - villagerArborist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_ARBORIST, Constants.TEXTURE_SKIN_LUMBERJACK); + villagerArborist = new VillagerRegistry.VillagerProfession(Constants.ID_VILLAGER_ARBORIST, Constants.TEXTURE_SKIN_LUMBERJACK, Constants.TEXTURE_SKIN_ZOMBIE_LUMBERJACK); VillagerRegistry.instance().register(villagerArborist); VillagerRegistry.VillagerCareer arboristCareer = new VillagerRegistry.VillagerCareer(villagerArborist, "arborist"); diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index 0afef967e..68439f0f2 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -41,7 +41,9 @@ public class Constants implements IForestryConstants { public static final String TEXTURE_APIARIST_ARMOR_SECONDARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_2.png"; public static final String TEXTURE_NATURALIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/naturalist_armor_1.png"; public static final String TEXTURE_SKIN_BEEKPEEPER = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/beekeeper.png"; + public static final String TEXTURE_SKIN_ZOMBIE_BEEKPEEPER = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/zombie_beekeeper.png"; public static final String TEXTURE_SKIN_LUMBERJACK = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/lumberjack.png"; + public static final String TEXTURE_SKIN_ZOMBIE_LUMBERJACK = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/zombie_lumberjack.png"; // Villagers public static final String ID_VILLAGER_APIARIST = Constants.MOD_ID + ":apiarist"; diff --git a/src/main/resources/assets/forestry/textures/entity/zombie_beekeeper.png b/src/main/resources/assets/forestry/textures/entity/zombie_beekeeper.png new file mode 100644 index 0000000000000000000000000000000000000000..039f051a3ae93b5c8fbe614cea70fb8432169c90 GIT binary patch literal 2512 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