mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Flatten dyes and petals
This commit is contained in:
1 parent
c3324c64e4
commit
01c9333016
143 files changed
+615
-670
No files matched your search
@@ -27,6 +27,7 @@ import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.block.tile.TileCamo;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.entity.EntityManaBurst;
|
||||
import vazkii.botania.common.item.Item16Colors;
|
||||
import vazkii.botania.common.item.ItemManaGun;
|
||||
import vazkii.botania.common.item.ItemManaMirror;
|
||||
import vazkii.botania.common.item.ItemManaTablet;
|
||||
@@ -109,7 +110,12 @@ public final class ColorHandler {
|
||||
: -1,
|
||||
ModItems.twigWand);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getColorValue(), ModItems.dye, ModItems.petal);
|
||||
IItemColor handler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue;
|
||||
Item[] dyes = ModItems.dyes.values().toArray(new Item[0]);
|
||||
Item[] petals = ModItems.petals.values().toArray(new Item[0]);
|
||||
items.registerItemColorHandler(handler, dyes);
|
||||
items.registerItemColorHandler(handler, petals);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).getBlock().getStateFromMeta(s.getMetadata()), null, null, t),
|
||||
ModBlocks.petalBlock, ModBlocks.pool, ModBlocks.spreader);
|
||||
|
||||
@@ -159,7 +165,7 @@ public final class ColorHandler {
|
||||
items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick);
|
||||
|
||||
// todo 1.13 use tags instead of looping registry
|
||||
IItemColor handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1;
|
||||
handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1;
|
||||
for (Item i : Item.REGISTRY) {
|
||||
if(i instanceof ItemLens && i.getRegistryName().getResourceDomain().equals(LibMisc.MOD_ID)) {
|
||||
items.registerItemColorHandler(handler, i);
|
||||
|
||||
@@ -56,6 +56,7 @@ import vazkii.botania.common.block.tile.TileSpecialFlower;
|
||||
import vazkii.botania.common.core.BotaniaCreativeTab;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
|
||||
import vazkii.botania.common.item.material.ItemDye;
|
||||
import vazkii.botania.common.lib.LibBlockNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
@@ -312,8 +313,8 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!stack.isEmpty() && stack.getItem() == ModItems.dye) {
|
||||
EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage());
|
||||
if(!stack.isEmpty() && stack.getItem() instanceof ItemDye) {
|
||||
EnumDyeColor newColor = ((ItemDye) stack.getItem()).color;
|
||||
EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR);
|
||||
if(newColor != oldColor)
|
||||
world.setBlockState(pos, state.withProperty(BotaniaStateProps.COLOR, newColor), 1 | 2);
|
||||
|
||||
@@ -79,7 +79,12 @@ public class BlockBuriedPetals extends BlockModFlower {
|
||||
@Nonnull
|
||||
@Override
|
||||
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
|
||||
return ModItems.petal;
|
||||
return ModItems.petals.get(state.getValue(BotaniaStateProps.COLOR));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -55,9 +55,9 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
|
||||
addBlock(ModBlocks.flower);
|
||||
addBlock(ModBlocks.specialFlower);
|
||||
addItem(ModItems.petal);
|
||||
ModItems.petals.values().forEach(this::addItem);
|
||||
addItem(ModItems.pestleAndMortar);
|
||||
addItem(ModItems.dye);
|
||||
ModItems.dyes.values().forEach(this::addItem);
|
||||
addItem(ModItems.fertilizer);
|
||||
addItem(ModItems.flowerBag);
|
||||
addItem(ModItems.blackLotus);
|
||||
|
||||
@@ -42,6 +42,7 @@ import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe;
|
||||
import vazkii.botania.common.crafting.recipe.SpellClothRecipe;
|
||||
import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
@@ -409,9 +410,9 @@ public final class ModCraftingRecipes {
|
||||
|
||||
public static void init() {
|
||||
// Can't do this in RegistryEvent.Register event handler since it seems JSON recipes aren't loaded yet
|
||||
recipesPetals = allOfGroup(ModItems.petal.getRegistryName());
|
||||
recipesPetals = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.PETAL));
|
||||
recipePestleAndMortar = ModItems.pestleAndMortar.getRegistryName();
|
||||
recipesDyes = allOfGroup(ModItems.dye.getRegistryName());
|
||||
recipesDyes = allOfGroup(new ResourceLocation(LibMisc.MOD_ID, LibItemNames.DYE));
|
||||
recipeFertilizerPowder = gogPath("fertilizer_powder");
|
||||
recipeFerilizerDye = path("fertilizer_dye");
|
||||
recipesPetalsDouble = allOfGroup("petal_double");
|
||||
|
||||
@@ -59,8 +59,8 @@ public final class ModManaInfusionRecipes {
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.REDSTONE), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.GLOWSTONE_DUST), 500));
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(Items.SUGAR), 500));
|
||||
for(int i = 0; i < 16; i++)
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(ModItems.dye, 1, i), 400));
|
||||
for(Item dye : ModItems.dyes.values())
|
||||
manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), new ItemStack(dye), 400));
|
||||
|
||||
pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), new ItemStack(Blocks.PISTON), 15000);
|
||||
manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), new ItemStack(Items.COOKIE), 20000);
|
||||
|
||||
@@ -30,6 +30,7 @@ import vazkii.botania.api.corporea.ICorporeaSpark;
|
||||
import vazkii.botania.api.corporea.InvWithLocation;
|
||||
import vazkii.botania.common.core.helper.InventoryHelper;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.material.ItemDye;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import java.util.ArrayList;
|
||||
@@ -261,7 +262,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!isDead && !stack.isEmpty()) {
|
||||
if(player.world.isRemote) {
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk;
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemDye || stack.getItem() == ModItems.phantomInk;
|
||||
if(valid)
|
||||
player.swingArm(hand);
|
||||
return valid;
|
||||
@@ -276,10 +277,10 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark {
|
||||
displayRelatives(player, new ArrayList<>(), master);
|
||||
}
|
||||
return true;
|
||||
} else if(stack.getItem() == ModItems.dye) {
|
||||
int color = stack.getItemDamage();
|
||||
if(color != getNetwork().getMetadata()) {
|
||||
setNetwork(EnumDyeColor.byMetadata(color));
|
||||
} else if(stack.getItem() instanceof ItemDye) {
|
||||
EnumDyeColor color = ((ItemDye) stack.getItem()).color;
|
||||
if(color != getNetwork()) {
|
||||
setNetwork(color);
|
||||
|
||||
if(isMaster())
|
||||
restartNetwork();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package vazkii.botania.common.fixers;
|
||||
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.datafix.IFixableData;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
@@ -48,6 +49,14 @@ public class FlattenItems implements IFixableData {
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]);
|
||||
LOOKUP.put("botania:dye", i -> {
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(i);
|
||||
return LibMisc.MOD_ID + ":" + LibItemNames.DYE + "_" + color.getName();
|
||||
});
|
||||
LOOKUP.put("botania:petal", i -> {
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(i);
|
||||
return LibMisc.MOD_ID + ":" + LibItemNames.PETAL + "_" + color.getName();
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,45 +10,14 @@
|
||||
*/
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.client.core.handler.ModelHandler;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class Item16Colors extends ItemMod {
|
||||
public final EnumDyeColor color;
|
||||
|
||||
public Item16Colors(String name) {
|
||||
super(name);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> stacks) {
|
||||
if(isInCreativeTab(tab)) {
|
||||
for(int i = 0; i < 16; i++)
|
||||
stacks.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerItemAllMeta(this, EnumDyeColor.values().length);
|
||||
}
|
||||
|
||||
String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
|
||||
return super.getUnlocalizedName(par1ItemStack);
|
||||
public Item16Colors(String name, EnumDyeColor color) {
|
||||
super(name + "_" + color.getName());
|
||||
this.color = color;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemRecord;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -96,11 +97,21 @@ import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID)
|
||||
public final class ModItems {
|
||||
public static final Item lexicon = new ItemLexicon();
|
||||
public static final Item petal = new ItemPetal();
|
||||
public static final Item dye = new ItemDye();
|
||||
public static final Map<EnumDyeColor, Item> petals = new EnumMap<>(EnumDyeColor.class);
|
||||
public static final Map<EnumDyeColor, Item> dyes = new EnumMap<>(EnumDyeColor.class);
|
||||
static {
|
||||
for(EnumDyeColor color : EnumDyeColor.values()) {
|
||||
petals.put(color, new ItemPetal(color));
|
||||
dyes.put(color, new ItemDye(color));
|
||||
}
|
||||
}
|
||||
|
||||
public static final Item pestleAndMortar = new ItemPestleAndMortar();
|
||||
public static final Item twigWand = new ItemTwigWand();
|
||||
|
||||
@@ -314,8 +325,8 @@ public final class ModItems {
|
||||
IForgeRegistry<Item> r = evt.getRegistry();
|
||||
|
||||
r.register(lexicon);
|
||||
r.register(petal);
|
||||
r.register(dye);
|
||||
petals.values().forEach(r::register);
|
||||
dyes.values().forEach(r::register);
|
||||
r.register(pestleAndMortar);
|
||||
r.register(twigWand);
|
||||
r.register(manaSteel);
|
||||
@@ -526,12 +537,16 @@ public final class ModItems {
|
||||
|
||||
private static void registerOreDictionary() {
|
||||
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
|
||||
for(EnumDyeColor color : EnumDyeColor.values()) {
|
||||
OreDictionary.registerOre(LibOreDict.PETAL[color.getMetadata()], new ItemStack(petals.get(color)));
|
||||
OreDictionary.registerOre(LibOreDict.DYE[color.getMetadata()], new ItemStack(dyes.get(color)));
|
||||
OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dyes.get(color)));
|
||||
}
|
||||
|
||||
for(int i = 0; i < 16; i++) {
|
||||
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i));
|
||||
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
|
||||
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
|
||||
}
|
||||
OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz));
|
||||
OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz));
|
||||
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.item.material;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockCarpet;
|
||||
import net.minecraft.block.BlockColored;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.passive.EntitySheep;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -25,16 +26,20 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.mana.IManaPool;
|
||||
import vazkii.botania.common.item.Item16Colors;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class ItemDye extends Item16Colors {
|
||||
|
||||
public ItemDye() {
|
||||
super(LibItemNames.DYE);
|
||||
public ItemDye(EnumDyeColor color) {
|
||||
super(LibItemNames.DYE, color);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -42,7 +47,7 @@ public class ItemDye extends Item16Colors {
|
||||
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
Block block = world.getBlockState(pos).getBlock();
|
||||
EnumDyeColor color = EnumDyeColor.byMetadata(stack.getItemDamage());
|
||||
|
||||
if(block == Blocks.WOOL && color != world.getBlockState(pos).getValue(BlockColored.COLOR)
|
||||
|| block == Blocks.CARPET && color != world.getBlockState(pos).getValue(BlockCarpet.COLOR)) {
|
||||
world.setBlockState(pos, world.getBlockState(pos).withProperty(block == Blocks.WOOL ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2);
|
||||
@@ -67,10 +72,9 @@ public class ItemDye extends Item16Colors {
|
||||
public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target, EnumHand hand) {
|
||||
if(target instanceof EntitySheep) {
|
||||
EntitySheep entitysheep = (EntitySheep)target;
|
||||
EnumDyeColor i = EnumDyeColor.byMetadata(stack.getItemDamage());
|
||||
|
||||
if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) {
|
||||
entitysheep.setFleeceColor(i);
|
||||
if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != color) {
|
||||
entitysheep.setFleeceColor(color);
|
||||
stack.shrink(1);
|
||||
}
|
||||
|
||||
@@ -79,4 +83,10 @@ public class ItemDye extends Item16Colors {
|
||||
return false;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.DYE, "inventory"));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -13,6 +13,7 @@ package vazkii.botania.common.item.material;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -23,18 +24,22 @@ import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import vazkii.botania.api.item.IPetalApothecary;
|
||||
import vazkii.botania.api.recipe.IFlowerComponent;
|
||||
import vazkii.botania.common.block.ModBlocks;
|
||||
import vazkii.botania.common.item.Item16Colors;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class ItemPetal extends Item16Colors implements IFlowerComponent {
|
||||
|
||||
public ItemPetal() {
|
||||
super(LibItemNames.PETAL);
|
||||
public ItemPetal(EnumDyeColor color) {
|
||||
super(LibItemNames.PETAL, color);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@@ -86,7 +91,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent {
|
||||
|
||||
@Override
|
||||
public int getMetadata(int stackMeta) {
|
||||
return MathHelper.clamp(stackMeta, 0, 15);
|
||||
return color.getMetadata();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -96,6 +101,12 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent {
|
||||
|
||||
@Override
|
||||
public int getParticleColor(ItemStack stack) {
|
||||
return EnumDyeColor.byMetadata(stack.getItemDamage()).colorValue;
|
||||
return color.colorValue;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(LibMisc.MOD_ID + ":" + LibItemNames.PETAL, "inventory"));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user