mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Remove floral powders in favor of the generic vanilla dyes
This commit is contained in:
1 parent
57f910f067
commit
b631775c32
134 files changed
+162
-1156
No files matched your search
@@ -120,10 +120,8 @@ public final class ColorHandler {
|
||||
ModItems.twigWand);
|
||||
|
||||
IItemColor petalHandler = (s, t) -> t == 0 ? ((ItemPetal) s.getItem()).color.colorValue : -1;
|
||||
IItemColor dyeHandler = (s, t) -> t == 0 ? ((Item16Colors) s.getItem()).color.colorValue : -1;
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
items.register(petalHandler, ModItems.getPetal(color));
|
||||
items.register(dyeHandler, ModItems.getDye(color));
|
||||
}
|
||||
|
||||
items.register((s, t) -> t == 0 ? Minecraft.getInstance().getBlockColors().getColor(((BlockItem) s.getItem()).getBlock().getDefaultState(), null, null, t) : -1,
|
||||
@@ -190,8 +188,8 @@ public final class ColorHandler {
|
||||
|
||||
items.register((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? MathHelper.hsvToRGB(0.375F, (float) Math.min(1F, Math.sin(Util.milliTime() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick);
|
||||
|
||||
dyeHandler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1;
|
||||
items.register(dyeHandler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce,
|
||||
IItemColor lensHandler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1;
|
||||
items.register(lensHandler, ModItems.lensNormal, ModItems.lensSpeed, ModItems.lensPower, ModItems.lensTime, ModItems.lensEfficiency, ModItems.lensBounce,
|
||||
ModItems.lensGravity, ModItems.lensMine, ModItems.lensDamage, ModItems.lensPhantom, ModItems.lensMagnet,
|
||||
ModItems.lensExplosive, ModItems.lensWeight, ModItems.lensPaint, ModItems.lensFire, ModItems.lensPiston,
|
||||
ModItems.lensLight, ModItems.lensWarp, ModItems.lensRedirect, ModItems.lensFirework, ModItems.lensFlare,
|
||||
|
||||
@@ -119,11 +119,11 @@ public final class RenderHelper {
|
||||
LINE_8_NO_DEPTH = RenderType.makeType(LibResources.PREFIX_MOD + "line_8_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState);
|
||||
|
||||
glState = RenderType.State.getBuilder()
|
||||
.texture(mipmapBlockAtlasTexture)
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.target(itemTarget)
|
||||
.alpha(new RenderState.AlphaState(0.05F))
|
||||
.lightmap(enableLightmap).build(true);
|
||||
.texture(mipmapBlockAtlasTexture)
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.target(itemTarget)
|
||||
.alpha(new RenderState.AlphaState(0.05F))
|
||||
.lightmap(enableLightmap).build(true);
|
||||
// todo 1.15: need normals?
|
||||
SPARK = RenderType.makeType(LibResources.PREFIX_MOD + "spark", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, glState);
|
||||
RenderType lightRelay = RenderType.makeType(LibResources.PREFIX_MOD + "light_relay", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 64, glState);
|
||||
@@ -145,10 +145,10 @@ public final class RenderHelper {
|
||||
|
||||
RenderState.TextureState babylonTexture = new RenderState.TextureState(new ResourceLocation(LibResources.MISC_BABYLON), false, true);
|
||||
glState = RenderType.State.getBuilder().texture(babylonTexture)
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.target(itemTarget)
|
||||
.cull(disableCull)
|
||||
.shadeModel(smoothShade).build(true);
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.target(itemTarget)
|
||||
.cull(disableCull)
|
||||
.shadeModel(smoothShade).build(true);
|
||||
RenderType babylonIcon = RenderType.makeType(LibResources.PREFIX_MOD + "babylon", DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 64, glState);
|
||||
BABYLON_ICON = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, babylonIcon) : babylonIcon;
|
||||
|
||||
@@ -196,12 +196,12 @@ public final class RenderHelper {
|
||||
|
||||
private static RenderType getPylonGlow(String name, ResourceLocation texture, boolean direct) {
|
||||
RenderType.State.Builder glState = RenderType.State.getBuilder()
|
||||
.texture(new RenderState.TextureState(texture, false, false))
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.diffuseLighting(new RenderState.DiffuseLightingState(true))
|
||||
.alpha(new RenderState.AlphaState(0))
|
||||
.cull(new RenderState.CullState(false))
|
||||
.lightmap(new RenderState.LightmapState(true));
|
||||
.texture(new RenderState.TextureState(texture, false, false))
|
||||
.transparency(TRANSLUCENT_TRANSPARENCY)
|
||||
.diffuseLighting(new RenderState.DiffuseLightingState(true))
|
||||
.alpha(new RenderState.AlphaState(0))
|
||||
.cull(new RenderState.CullState(false))
|
||||
.lightmap(new RenderState.LightmapState(true));
|
||||
if (!direct) {
|
||||
RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_");
|
||||
glState = glState.target(itemTarget);
|
||||
|
||||
@@ -17,12 +17,17 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.DyeItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.loot.LootContext;
|
||||
import net.minecraft.loot.LootParameters;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.shapes.IBooleanFunction;
|
||||
import net.minecraft.util.math.shapes.ISelectionContext;
|
||||
import net.minecraft.util.math.shapes.VoxelShape;
|
||||
@@ -77,6 +82,22 @@ public class BlockPool extends BlockModWaterloggable implements ITileEntityProvi
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ActionResultType onBlockActivated(@Nonnull BlockState state, World world, @Nonnull BlockPos pos, PlayerEntity player, @Nonnull Hand hand, @Nonnull BlockRayTraceResult hit) {
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if (stack.getItem() instanceof DyeItem && te instanceof TilePool) {
|
||||
DyeColor color = ((DyeItem) stack.getItem()).getDyeColor();
|
||||
if (color != ((TilePool) te).getColor()) {
|
||||
((TilePool) te).setColor(color);
|
||||
stack.shrink(1);
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
}
|
||||
return super.onBlockActivated(state, world, pos, player, hand, hit);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(@Nonnull IBlockReader world) {
|
||||
|
||||
@@ -65,9 +65,6 @@ public final class BotaniaCreativeTab extends ItemGroup {
|
||||
this.addItem(ModItems.getPetal(color));
|
||||
}
|
||||
addItem(ModItems.pestleAndMortar);
|
||||
for (DyeColor color : DyeColor.values()) {
|
||||
this.addItem(ModItems.getDye(color));
|
||||
}
|
||||
addItem(ModItems.fertilizer);
|
||||
addItem(ModItems.flowerBag);
|
||||
addItem(ModItems.blackLotus);
|
||||
|
||||
@@ -86,20 +86,20 @@ public final class PixieHandler {
|
||||
/* todo unimpl
|
||||
double chance = player.getAttribute(PIXIE_SPAWN_CHANCE).getValue();
|
||||
ItemStack sword = PlayerHelper.getFirstHeldItem(player, s -> s.getItem() == ModItems.elementiumSword);
|
||||
|
||||
|
||||
if (Math.random() < chance) {
|
||||
EntityPixie pixie = new EntityPixie(player.world);
|
||||
pixie.setPosition(player.getPosX(), player.getPosY() + 2, player.getPosZ());
|
||||
|
||||
|
||||
if (((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) {
|
||||
pixie.setApplyPotionEffect(new EffectInstance(potions[event.getEntityLiving().world.rand.nextInt(potions.length)], 40, 0));
|
||||
}
|
||||
|
||||
|
||||
float dmg = 4;
|
||||
if (!sword.isEmpty()) {
|
||||
dmg += 2;
|
||||
}
|
||||
|
||||
|
||||
pixie.setProps((LivingEntity) event.getSource().getTrueSource(), player, 0, dmg);
|
||||
pixie.onInitialSpawn(player.world, player.world.getDifficultyForLocation(pixie.func_233580_cy_()),
|
||||
SpawnReason.EVENT, null, null);
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.DyeItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.network.IPacket;
|
||||
@@ -34,7 +35,6 @@ 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;
|
||||
|
||||
@@ -259,7 +259,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if (!removed && !stack.isEmpty()) {
|
||||
if (player.world.isRemote) {
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemDye || stack.getItem() == ModItems.phantomInk;
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof DyeItem || stack.getItem() == ModItems.phantomInk;
|
||||
if (valid) {
|
||||
player.swingArm(hand);
|
||||
}
|
||||
@@ -276,8 +276,8 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa
|
||||
displayRelatives(player, new ArrayList<>(), master);
|
||||
}
|
||||
return ActionResultType.SUCCESS;
|
||||
} else if (stack.getItem() instanceof ItemDye) {
|
||||
DyeColor color = ((ItemDye) stack.getItem()).color;
|
||||
} else if (stack.getItem() instanceof DyeItem) {
|
||||
DyeColor color = ((DyeItem) stack.getItem()).getDyeColor();
|
||||
if (color != getNetwork()) {
|
||||
setNetwork(color);
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import net.minecraft.entity.EntityType;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.DyeItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.network.IPacket;
|
||||
@@ -38,7 +39,6 @@ import vazkii.botania.api.mana.spark.SparkHelper;
|
||||
import vazkii.botania.api.mana.spark.SparkUpgradeType;
|
||||
import vazkii.botania.common.item.ItemSparkUpgrade;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.material.ItemDye;
|
||||
import vazkii.botania.common.network.PacketBotaniaEffect;
|
||||
import vazkii.botania.common.network.PacketHandler;
|
||||
|
||||
@@ -241,7 +241,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity {
|
||||
if (isAlive() && !stack.isEmpty()) {
|
||||
if (world.isRemote) {
|
||||
boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() instanceof ItemSparkUpgrade
|
||||
|| stack.getItem() == ModItems.phantomInk || stack.getItem() instanceof ItemDye;
|
||||
|| stack.getItem() == ModItems.phantomInk || stack.getItem() instanceof DyeItem;
|
||||
if (valid) {
|
||||
player.swingArm(hand);
|
||||
}
|
||||
@@ -273,8 +273,8 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity {
|
||||
} else if (stack.getItem() == ModItems.phantomInk) {
|
||||
setInvisible(true);
|
||||
return ActionResultType.SUCCESS;
|
||||
} else if (stack.getItem() instanceof ItemDye) {
|
||||
DyeColor color = ((ItemDye) stack.getItem()).color;
|
||||
} else if (stack.getItem() instanceof DyeItem) {
|
||||
DyeColor color = ((DyeItem) stack.getItem()).getDyeColor();
|
||||
if (color != getNetwork()) {
|
||||
setNetwork(color);
|
||||
stack.shrink(1);
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
/*
|
||||
* This class is distributed as part of the Botania Mod.
|
||||
* Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class Item16Colors extends Item {
|
||||
public final DyeColor color;
|
||||
|
||||
public Item16Colors(DyeColor color, Properties props) {
|
||||
super(props);
|
||||
this.color = color;
|
||||
}
|
||||
}
|
||||
@@ -11,10 +11,7 @@ package vazkii.botania.common.item;
|
||||
import net.minecraft.client.gui.ScreenManager;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.inventory.container.ContainerType;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Food;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.item.crafting.IRecipeSerializer;
|
||||
import net.minecraft.potion.EffectInstance;
|
||||
import net.minecraft.potion.Effects;
|
||||
@@ -101,23 +98,6 @@ public final class ModItems {
|
||||
public static final Item redPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.RED), DyeColor.RED, defaultBuilder());
|
||||
public static final Item blackPetal = new ItemPetal(ModBlocks.getBuriedPetal(DyeColor.BLACK), DyeColor.BLACK, defaultBuilder());
|
||||
|
||||
public static final Item whiteDye = new ItemDye(DyeColor.WHITE, defaultBuilder());
|
||||
public static final Item orangeDye = new ItemDye(DyeColor.ORANGE, defaultBuilder());
|
||||
public static final Item magentaDye = new ItemDye(DyeColor.MAGENTA, defaultBuilder());
|
||||
public static final Item lightBlueDye = new ItemDye(DyeColor.LIGHT_BLUE, defaultBuilder());
|
||||
public static final Item yellowDye = new ItemDye(DyeColor.YELLOW, defaultBuilder());
|
||||
public static final Item limeDye = new ItemDye(DyeColor.LIME, defaultBuilder());
|
||||
public static final Item pinkDye = new ItemDye(DyeColor.PINK, defaultBuilder());
|
||||
public static final Item grayDye = new ItemDye(DyeColor.GRAY, defaultBuilder());
|
||||
public static final Item lightGrayDye = new ItemDye(DyeColor.LIGHT_GRAY, defaultBuilder());
|
||||
public static final Item cyanDye = new ItemDye(DyeColor.CYAN, defaultBuilder());
|
||||
public static final Item purpleDye = new ItemDye(DyeColor.PURPLE, defaultBuilder());
|
||||
public static final Item blueDye = new ItemDye(DyeColor.BLUE, defaultBuilder());
|
||||
public static final Item brownDye = new ItemDye(DyeColor.BROWN, defaultBuilder());
|
||||
public static final Item greenDye = new ItemDye(DyeColor.GREEN, defaultBuilder());
|
||||
public static final Item redDye = new ItemDye(DyeColor.RED, defaultBuilder());
|
||||
public static final Item blackDye = new ItemDye(DyeColor.BLACK, defaultBuilder());
|
||||
|
||||
public static final Item pestleAndMortar = new ItemSelfReturning(unstackable());
|
||||
public static final Item twigWand = new ItemTwigWand(unstackable().rarity(Rarity.RARE));
|
||||
|
||||
@@ -434,22 +414,6 @@ public final class ModItems {
|
||||
register(r, "green" + LibItemNames.PETAL_SUFFIX, greenPetal);
|
||||
register(r, "red" + LibItemNames.PETAL_SUFFIX, redPetal);
|
||||
register(r, "black" + LibItemNames.PETAL_SUFFIX, blackPetal);
|
||||
register(r, "white" + LibItemNames.DYE_SUFFIX, whiteDye);
|
||||
register(r, "orange" + LibItemNames.DYE_SUFFIX, orangeDye);
|
||||
register(r, "magenta" + LibItemNames.DYE_SUFFIX, magentaDye);
|
||||
register(r, "light_blue" + LibItemNames.DYE_SUFFIX, lightBlueDye);
|
||||
register(r, "yellow" + LibItemNames.DYE_SUFFIX, yellowDye);
|
||||
register(r, "lime" + LibItemNames.DYE_SUFFIX, limeDye);
|
||||
register(r, "pink" + LibItemNames.DYE_SUFFIX, pinkDye);
|
||||
register(r, "gray" + LibItemNames.DYE_SUFFIX, grayDye);
|
||||
register(r, "light_gray" + LibItemNames.DYE_SUFFIX, lightGrayDye);
|
||||
register(r, "cyan" + LibItemNames.DYE_SUFFIX, cyanDye);
|
||||
register(r, "purple" + LibItemNames.DYE_SUFFIX, purpleDye);
|
||||
register(r, "blue" + LibItemNames.DYE_SUFFIX, blueDye);
|
||||
register(r, "brown" + LibItemNames.DYE_SUFFIX, brownDye);
|
||||
register(r, "green" + LibItemNames.DYE_SUFFIX, greenDye);
|
||||
register(r, "red" + LibItemNames.DYE_SUFFIX, redDye);
|
||||
register(r, "black" + LibItemNames.DYE_SUFFIX, blackDye);
|
||||
register(r, LibItemNames.PESTLE_AND_MORTAR, pestleAndMortar);
|
||||
register(r, LibItemNames.TWIG_WAND, twigWand);
|
||||
register(r, LibItemNames.MANASTEEL_INGOT, manaSteel);
|
||||
@@ -805,41 +769,4 @@ public final class ModItems {
|
||||
}
|
||||
}
|
||||
|
||||
public static Item getDye(DyeColor color) {
|
||||
switch (color) {
|
||||
default:
|
||||
case WHITE:
|
||||
return whiteDye;
|
||||
case ORANGE:
|
||||
return orangeDye;
|
||||
case MAGENTA:
|
||||
return magentaDye;
|
||||
case LIGHT_BLUE:
|
||||
return lightBlueDye;
|
||||
case YELLOW:
|
||||
return yellowDye;
|
||||
case LIME:
|
||||
return limeDye;
|
||||
case PINK:
|
||||
return pinkDye;
|
||||
case GRAY:
|
||||
return grayDye;
|
||||
case LIGHT_GRAY:
|
||||
return lightGrayDye;
|
||||
case CYAN:
|
||||
return cyanDye;
|
||||
case PURPLE:
|
||||
return purpleDye;
|
||||
case BLUE:
|
||||
return blueDye;
|
||||
case BROWN:
|
||||
return brownDye;
|
||||
case GREEN:
|
||||
return greenDye;
|
||||
case RED:
|
||||
return redDye;
|
||||
case BLACK:
|
||||
return blackDye;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,101 +0,0 @@
|
||||
/*
|
||||
* This class is distributed as part of the Botania Mod.
|
||||
* Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*/
|
||||
package vazkii.botania.common.item.material;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.passive.SheepEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemUseContext;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import vazkii.botania.api.mana.IManaPool;
|
||||
import vazkii.botania.common.core.helper.ColorHelper;
|
||||
import vazkii.botania.common.item.Item16Colors;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public class ItemDye extends Item16Colors {
|
||||
|
||||
public ItemDye(DyeColor color, Properties props) {
|
||||
super(color, props);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ActionResultType onItemUse(ItemUseContext ctx) {
|
||||
ItemStack stack = ctx.getItem();
|
||||
World world = ctx.getWorld();
|
||||
BlockPos pos = ctx.getPos();
|
||||
Block block = world.getBlockState(pos).getBlock();
|
||||
|
||||
if (shouldRecolor(block)) {
|
||||
world.setBlockState(pos, recolor(block, color));
|
||||
stack.shrink(1);
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
TileEntity tile = world.getTileEntity(pos);
|
||||
if (tile instanceof IManaPool) {
|
||||
IManaPool pool = (IManaPool) tile;
|
||||
if (color != pool.getColor()) {
|
||||
pool.setColor(color);
|
||||
stack.shrink(1);
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
}
|
||||
|
||||
return ActionResultType.PASS;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity target, Hand hand) {
|
||||
if (target instanceof SheepEntity) {
|
||||
SheepEntity entitysheep = (SheepEntity) target;
|
||||
|
||||
if (!entitysheep.getSheared() && entitysheep.getFleeceColor() != color) {
|
||||
entitysheep.setFleeceColor(color);
|
||||
stack.shrink(1);
|
||||
}
|
||||
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
return ActionResultType.PASS;
|
||||
}
|
||||
|
||||
private boolean shouldRecolor(Block block) {
|
||||
DyeColor woolColor = ColorHelper.WOOL_MAP.inverse().get(block.delegate);
|
||||
if (woolColor != null) {
|
||||
return woolColor != this.color;
|
||||
}
|
||||
|
||||
DyeColor carpetColor = ColorHelper.CARPET_MAP.inverse().get(block.delegate);
|
||||
if (carpetColor != null) {
|
||||
return carpetColor != this.color;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private BlockState recolor(Block original, DyeColor color) {
|
||||
if (ColorHelper.CARPET_MAP.containsValue(original.delegate)) {
|
||||
return ColorHelper.CARPET_MAP.get(color).get().getDefaultState();
|
||||
} else {
|
||||
return ColorHelper.WOOL_MAP.get(color).get().getDefaultState();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -63,8 +63,6 @@ public class ModTags {
|
||||
public static final ITag.INamedTag<Item> DISPOSABLE = tag("disposable");
|
||||
public static final ITag.INamedTag<Item> SEMI_DISPOSABLE = tag("semi_disposable");
|
||||
|
||||
public static final ITag.INamedTag<Item> DYES = tag("dyes");
|
||||
|
||||
public static final ITag.INamedTag<Item> PETALS = tag("petals");
|
||||
public static final ITag.INamedTag<Item> PETALS_BLACK = tag("petals/black");
|
||||
public static final ITag.INamedTag<Item> PETALS_BLUE = tag("petals/blue");
|
||||
|
||||
@@ -54,9 +54,6 @@ public class ItemTagProvider extends ItemTagsProvider {
|
||||
this.func_240522_a_(ItemTags.TALL_FLOWERS).func_240531_a_(ModTags.Items.DOUBLE_MYSTICAL_FLOWERS);
|
||||
this.func_240522_a_(ItemTags.SMALL_FLOWERS).func_240531_a_(ModTags.Items.MYSTICAL_FLOWERS);
|
||||
this.func_240522_a_(ItemTags.FLOWERS).func_240531_a_(ModTags.Items.SPECIAL_FLOWERS);
|
||||
|
||||
TagsProvider.Builder<Item> builder = func_240522_a_(ModTags.Items.DYES);
|
||||
Arrays.stream(DyeColor.values()).map(ModItems::getDye).sorted(Comparator.comparing(Registry.ITEM::getKey)).forEach(builder::func_240532_a_);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -15,10 +15,7 @@ import net.minecraft.block.Blocks;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.IFinishedRecipe;
|
||||
import net.minecraft.data.RecipeProvider;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.item.crafting.IRecipeSerializer;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.state.Property;
|
||||
@@ -65,7 +62,7 @@ public class ManaInfusionProvider extends RecipeProvider {
|
||||
|
||||
Ingredient dust = Ingredient.fromItems(Items.GUNPOWDER, Items.REDSTONE, Items.GLOWSTONE_DUST, Items.SUGAR);
|
||||
consumer.accept(new FinishedRecipe(id("mana_powder_dust"), new ItemStack(ModItems.manaPowder), dust, 500));
|
||||
Ingredient dyeIngredient = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(ModItems::getDye).toArray(Item[]::new));
|
||||
Ingredient dyeIngredient = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(DyeItem::getItem).toArray(Item[]::new));
|
||||
consumer.accept(new FinishedRecipe(id("mana_powder_dye"), new ItemStack(ModItems.manaPowder), dyeIngredient, 400));
|
||||
|
||||
consumer.accept(new FinishedRecipe(id("piston_relay"), new ItemStack(ModBlocks.pistonRelay), ingr(Blocks.PISTON), 15000));
|
||||
|
||||
@@ -15,13 +15,11 @@ import net.minecraft.advancements.AdvancementRewards;
|
||||
import net.minecraft.advancements.ICriterionInstance;
|
||||
import net.minecraft.advancements.IRequirementsStrategy;
|
||||
import net.minecraft.advancements.criterion.InventoryChangeTrigger;
|
||||
import net.minecraft.advancements.criterion.ItemPredicate;
|
||||
import net.minecraft.advancements.criterion.RecipeUnlockedTrigger;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.data.*;
|
||||
import net.minecraft.item.DyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
import net.minecraft.item.crafting.SpecialRecipeSerializer;
|
||||
import net.minecraft.potion.PotionUtils;
|
||||
@@ -596,12 +594,6 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider {
|
||||
.addIngredient(dyes, 4)
|
||||
.addCriterion("has_item", hasItem(Tags.Items.DYES))
|
||||
.build(consumer, "botania:fertilizer_dye");
|
||||
Ingredient floralDyes = Ingredient.fromItems(Arrays.stream(DyeColor.values()).map(ModItems::getDye).toArray(Item[]::new));
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.fertilizer)
|
||||
.addIngredient(Items.BONE_MEAL)
|
||||
.addIngredient(floralDyes, 4)
|
||||
.addCriterion("has_item", hasItem(ModTags.Items.DYES))
|
||||
.build(consumer, "botania:fertilizer_powder");
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.drySeeds)
|
||||
.addIngredient(ModItems.grassSeeds)
|
||||
.addIngredient(Items.DEAD_BUSH)
|
||||
@@ -907,7 +899,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider {
|
||||
.build(consumer);
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModBlocks.getMushroom(color))
|
||||
.addIngredient(Ingredient.fromItems(Items.RED_MUSHROOM, Items.BROWN_MUSHROOM))
|
||||
.addIngredient(ModItems.getDye(color))
|
||||
.addIngredient(DyeItem.getItem(color))
|
||||
.setGroup("botania:mushroom")
|
||||
.addCriterion("has_item", hasItem(Items.RED_MUSHROOM))
|
||||
.addCriterion("has_alt_item", hasItem(Items.BROWN_MUSHROOM))
|
||||
@@ -924,41 +916,40 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider {
|
||||
.addCriterion("has_item", hasItem(ModBlocks.getFlower(color)))
|
||||
.addCriterion("has_alt_item", hasItem(ModItems.getPetal(color)))
|
||||
.build(consumer, "botania:petal_" + color.func_176610_l());
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.getDye(color))
|
||||
ShapelessRecipeBuilder.shapelessRecipe(DyeItem.getItem(color))
|
||||
.addIngredient(colorOverrides.getOrDefault(color, Ingredient.fromTag(ModTags.Items.getFlowerTag(color))))
|
||||
.addIngredient(ModItems.pestleAndMortar)
|
||||
.setGroup("botania:dye")
|
||||
.addCriterion("has_item", hasItem(ModItems.getDye(color)))
|
||||
.addCriterion("has_alt_item", hasItem(ModItems.getPetal(color)))
|
||||
.addCriterion("has_item", hasItem(ModItems.getPetal(color)))
|
||||
.build(consumer, "botania:dye_" + color.func_176610_l());
|
||||
}
|
||||
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.magentaDye, 2)
|
||||
ShapelessRecipeBuilder.shapelessRecipe(Items.MAGENTA_DYE, 2)
|
||||
.addIngredient(Items.LILAC)
|
||||
.addIngredient(ModItems.pestleAndMortar)
|
||||
.setGroup("botania:dye_double")
|
||||
.addCriterion("has_item", hasItem(ModItems.yellowDye))
|
||||
.addCriterion("has_item", hasItem(Items.YELLOW_DYE))
|
||||
.addCriterion("has_alt_item", hasItem(Items.LILAC))
|
||||
.build(consumer, "botania:dye_magenta_double");
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.pinkDye, 2)
|
||||
ShapelessRecipeBuilder.shapelessRecipe(Items.PINK_DYE, 2)
|
||||
.addIngredient(Items.PEONY)
|
||||
.addIngredient(ModItems.pestleAndMortar)
|
||||
.setGroup("botania:dye_double")
|
||||
.addCriterion("has_item", hasItem(ModItems.pinkDye))
|
||||
.addCriterion("has_item", hasItem(Items.PINK_DYE))
|
||||
.addCriterion("has_alt_item", hasItem(Items.PEONY))
|
||||
.build(consumer, "botania:dye_pink_double");
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.redDye, 2)
|
||||
ShapelessRecipeBuilder.shapelessRecipe(Items.RED_DYE, 2)
|
||||
.addIngredient(Items.ROSE_BUSH)
|
||||
.addIngredient(ModItems.pestleAndMortar)
|
||||
.setGroup("botania:dye_double")
|
||||
.addCriterion("has_item", hasItem(ModItems.redDye))
|
||||
.addCriterion("has_item", hasItem(Items.RED_DYE))
|
||||
.addCriterion("has_alt_item", hasItem(Items.ROSE_BUSH))
|
||||
.build(consumer, "botania:dye_red_double");
|
||||
ShapelessRecipeBuilder.shapelessRecipe(ModItems.yellowDye, 2)
|
||||
ShapelessRecipeBuilder.shapelessRecipe(Items.YELLOW_DYE, 2)
|
||||
.addIngredient(Items.SUNFLOWER)
|
||||
.addIngredient(ModItems.pestleAndMortar)
|
||||
.setGroup("botania:dye_double")
|
||||
.addCriterion("has_item", hasItem(ModItems.yellowDye))
|
||||
.addCriterion("has_item", hasItem(Items.YELLOW_DYE))
|
||||
.addCriterion("has_alt_item", hasItem(Items.SUNFLOWER))
|
||||
.build(consumer, "botania:dye_yellow_double");
|
||||
}
|
||||
@@ -2299,22 +2290,22 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider {
|
||||
cosmeticBauble(consumer, ModItems.devilTail, ModItems.greenPetal);
|
||||
cosmeticBauble(consumer, ModItems.kamuiEye, ModItems.redPetal);
|
||||
cosmeticBauble(consumer, ModItems.googlyEyes, ModItems.blackPetal);
|
||||
cosmeticBauble(consumer, ModItems.fourLeafClover, ModItems.whiteDye);
|
||||
cosmeticBauble(consumer, ModItems.clockEye, ModItems.orangeDye);
|
||||
cosmeticBauble(consumer, ModItems.unicornHorn, ModItems.magentaDye);
|
||||
cosmeticBauble(consumer, ModItems.devilHorns, ModItems.lightBlueDye);
|
||||
cosmeticBauble(consumer, ModItems.hyperPlus, ModItems.yellowDye);
|
||||
cosmeticBauble(consumer, ModItems.botanistEmblem, ModItems.limeDye);
|
||||
cosmeticBauble(consumer, ModItems.ancientMask, ModItems.pinkDye);
|
||||
cosmeticBauble(consumer, ModItems.eerieMask, ModItems.grayDye);
|
||||
cosmeticBauble(consumer, ModItems.alienAntenna, ModItems.lightGrayDye);
|
||||
cosmeticBauble(consumer, ModItems.anaglyphGlasses, ModItems.cyanDye);
|
||||
cosmeticBauble(consumer, ModItems.orangeShades, ModItems.purpleDye);
|
||||
cosmeticBauble(consumer, ModItems.grouchoGlasses, ModItems.blueDye);
|
||||
cosmeticBauble(consumer, ModItems.thickEyebrows, ModItems.brownDye);
|
||||
cosmeticBauble(consumer, ModItems.lusitanicShield, ModItems.greenDye);
|
||||
cosmeticBauble(consumer, ModItems.tinyPotatoMask, ModItems.redDye);
|
||||
cosmeticBauble(consumer, ModItems.questgiverMark, ModItems.blackDye);
|
||||
cosmeticBauble(consumer, ModItems.fourLeafClover, Items.WHITE_DYE);
|
||||
cosmeticBauble(consumer, ModItems.clockEye, Items.ORANGE_DYE);
|
||||
cosmeticBauble(consumer, ModItems.unicornHorn, Items.MAGENTA_DYE);
|
||||
cosmeticBauble(consumer, ModItems.devilHorns, Items.LIGHT_BLUE_DYE);
|
||||
cosmeticBauble(consumer, ModItems.hyperPlus, Items.YELLOW_DYE);
|
||||
cosmeticBauble(consumer, ModItems.botanistEmblem, Items.LIME_DYE);
|
||||
cosmeticBauble(consumer, ModItems.ancientMask, Items.PINK_DYE);
|
||||
cosmeticBauble(consumer, ModItems.eerieMask, Items.GRAY_DYE);
|
||||
cosmeticBauble(consumer, ModItems.alienAntenna, Items.LIGHT_GRAY_DYE);
|
||||
cosmeticBauble(consumer, ModItems.anaglyphGlasses, Items.CYAN_DYE);
|
||||
cosmeticBauble(consumer, ModItems.orangeShades, Items.PURPLE_DYE);
|
||||
cosmeticBauble(consumer, ModItems.grouchoGlasses, Items.BLUE_DYE);
|
||||
cosmeticBauble(consumer, ModItems.thickEyebrows, Items.BROWN_DYE);
|
||||
cosmeticBauble(consumer, ModItems.lusitanicShield, Items.GREEN_DYE);
|
||||
cosmeticBauble(consumer, ModItems.tinyPotatoMask, Items.RED_DYE);
|
||||
cosmeticBauble(consumer, ModItems.questgiverMark, Items.BLACK_DYE);
|
||||
cosmeticBauble(consumer, ModItems.thinkingHand, ModBlocks.tinyPotato);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user