mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 11:49:37 +00:00
Merge 1.14
This commit is contained in:
commit
d66058f661
199 files changed
+308
-2249
No files matched your search
@@ -299,13 +299,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderHUD(Minecraft mc) {}
|
||||
|
||||
/**
|
||||
* Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower)
|
||||
*/
|
||||
public int getLightValue() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the comparator input value for this SubTileEntity
|
||||
*/
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
package vazkii.botania.client.core.handler;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.SimpleSound;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.client.event.InputEvent;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.item.ItemLexicon;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
import vazkii.patchouli.api.BookDrawScreenEvent;
|
||||
import vazkii.patchouli.client.book.gui.GuiBook;
|
||||
|
||||
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT)
|
||||
public class KonamiHandler {
|
||||
private static final int[] KONAMI_CODE = {
|
||||
GLFW.GLFW_KEY_UP, GLFW.GLFW_KEY_UP,
|
||||
GLFW.GLFW_KEY_DOWN, GLFW.GLFW_KEY_DOWN,
|
||||
GLFW.GLFW_KEY_LEFT, GLFW.GLFW_KEY_RIGHT,
|
||||
GLFW.GLFW_KEY_LEFT, GLFW.GLFW_KEY_RIGHT,
|
||||
GLFW.GLFW_KEY_B, GLFW.GLFW_KEY_A,
|
||||
};
|
||||
private static int nextLetter = 0;
|
||||
private static int konamiTime = 0;
|
||||
|
||||
private static boolean isBookOpen() {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
return mc.currentScreen instanceof GuiBook && ((GuiBook) mc.currentScreen).book == ItemLexicon.getBook();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void clientTick(TickEvent.ClientTickEvent evt) {
|
||||
if (konamiTime > 0) {
|
||||
konamiTime--;
|
||||
}
|
||||
|
||||
if (!isBookOpen()) {
|
||||
nextLetter = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void handleInput(InputEvent.KeyInputEvent evt) {
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (evt.getModifiers() == 0 && evt.getAction() == GLFW.GLFW_PRESS && isBookOpen()) {
|
||||
if (konamiTime == 0 && evt.getKey() == KONAMI_CODE[nextLetter]) {
|
||||
nextLetter++;
|
||||
if (nextLetter >= KONAMI_CODE.length) {
|
||||
mc.getSoundHandler().play(SimpleSound.master(ModSounds.way, 1.0F));
|
||||
nextLetter = 0;
|
||||
konamiTime = 240;
|
||||
}
|
||||
} else {
|
||||
nextLetter = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void renderBook(BookDrawScreenEvent evt) {
|
||||
if(konamiTime > 0) {
|
||||
String meme = I18n.format("botania.subtitle.way");
|
||||
GlStateManager.disableDepthTest();
|
||||
GlStateManager.pushMatrix();
|
||||
int fullWidth = Minecraft.getInstance().fontRenderer.getStringWidth(meme);
|
||||
int left = evt.gui.width;
|
||||
double widthPerTick = (fullWidth + evt.gui.width) / 240;
|
||||
double currWidth = left - widthPerTick * (240 - (konamiTime - evt.partialTicks)) * 3.2;
|
||||
|
||||
GlStateManager.translated(currWidth, evt.gui.height / 2 - 10, 0);
|
||||
GlStateManager.scalef(4, 4, 4);
|
||||
Minecraft.getInstance().fontRenderer.drawStringWithShadow(meme, 0, 0, 0xFFFFFF);
|
||||
GlStateManager.popMatrix();
|
||||
GlStateManager.enableDepthTest();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -39,6 +39,7 @@ import vazkii.botania.api.item.IFloatingFlower;
|
||||
import vazkii.botania.client.core.proxy.ClientProxy;
|
||||
import vazkii.botania.common.advancements.AlfPortalTrigger;
|
||||
import vazkii.botania.common.advancements.CorporeaRequestTrigger;
|
||||
import vazkii.botania.common.advancements.ManaGunTrigger;
|
||||
import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger;
|
||||
import vazkii.botania.common.advancements.RelicBindTrigger;
|
||||
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
|
||||
@@ -211,6 +212,7 @@ public class Botania {
|
||||
CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE);
|
||||
CriteriaTriggers.register(RelicBindTrigger.INSTANCE);
|
||||
CriteriaTriggers.register(UseItemSuccessTrigger.INSTANCE);
|
||||
CriteriaTriggers.register(ManaGunTrigger.INSTANCE);
|
||||
|
||||
CraftingHelper.register(FluxfieldCondition.SERIALIZER);
|
||||
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
package vazkii.botania.common.advancements;
|
||||
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonObject;
|
||||
import net.minecraft.advancements.ICriterionInstance;
|
||||
import net.minecraft.advancements.ICriterionTrigger;
|
||||
import net.minecraft.advancements.PlayerAdvancements;
|
||||
import net.minecraft.advancements.criterion.EntityPredicate;
|
||||
import net.minecraft.advancements.criterion.ItemPredicate;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import vazkii.botania.common.item.ItemManaGun;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
|
||||
|
||||
public class ManaGunTrigger implements ICriterionTrigger<ManaGunTrigger.Instance> {
|
||||
private static final ResourceLocation ID = prefix("fire_mana_blaster");
|
||||
|
||||
public static final ManaGunTrigger INSTANCE = new ManaGunTrigger();
|
||||
private final Map<PlayerAdvancements, ManaGunTrigger.PlayerTracker> playerTrackers = new HashMap<>();
|
||||
|
||||
private ManaGunTrigger() {}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ResourceLocation getId() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<ManaGunTrigger.Instance> listener) {
|
||||
this.playerTrackers.computeIfAbsent(player, ManaGunTrigger.PlayerTracker::new).listeners.add(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener<ManaGunTrigger.Instance> listener) {
|
||||
ManaGunTrigger.PlayerTracker tracker = this.playerTrackers.get(player);
|
||||
|
||||
if(tracker != null) {
|
||||
tracker.listeners.remove(listener);
|
||||
|
||||
if(tracker.listeners.isEmpty()) {
|
||||
this.playerTrackers.remove(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeAllListeners(@Nonnull PlayerAdvancements player) {
|
||||
playerTrackers.remove(player);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ManaGunTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) {
|
||||
Boolean desu = json.get("desu") == null ? null : json.get("desu").getAsBoolean();
|
||||
return new ManaGunTrigger.Instance(ItemPredicate.deserialize(json.get("item")), EntityPredicate.deserialize(json.get("user")), desu);
|
||||
}
|
||||
|
||||
static class PlayerTracker {
|
||||
private final PlayerAdvancements playerAdvancements;
|
||||
final Set<Listener<ManaGunTrigger.Instance>> listeners = new HashSet<>();
|
||||
|
||||
PlayerTracker(PlayerAdvancements playerAdvancementsIn) {
|
||||
this.playerAdvancements = playerAdvancementsIn;
|
||||
}
|
||||
|
||||
public void trigger(ServerPlayerEntity player, ItemStack stack) {
|
||||
List<Listener<ManaGunTrigger.Instance>> list = new ArrayList<>();
|
||||
|
||||
for(Listener<ManaGunTrigger.Instance> listener : this.listeners) {
|
||||
if(listener.getCriterionInstance().test(stack, player)) {
|
||||
list.add(listener);
|
||||
}
|
||||
}
|
||||
|
||||
for(Listener<ManaGunTrigger.Instance> listener : list) {
|
||||
listener.grantCriterion(this.playerAdvancements);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void trigger(ServerPlayerEntity player, ItemStack stack) {
|
||||
ManaGunTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements());
|
||||
if(tracker != null) {
|
||||
tracker.trigger(player, stack);
|
||||
}
|
||||
}
|
||||
|
||||
static class Instance implements ICriterionInstance {
|
||||
private final ItemPredicate item;
|
||||
private final EntityPredicate user;
|
||||
@Nullable
|
||||
private final Boolean desu;
|
||||
|
||||
Instance(ItemPredicate count, EntityPredicate user, Boolean desu) {
|
||||
this.item = count;
|
||||
this.user = user;
|
||||
this.desu = desu;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public ResourceLocation getId() {
|
||||
return ID;
|
||||
}
|
||||
|
||||
boolean test(ItemStack stack, ServerPlayerEntity entity) {
|
||||
return this.item.test(stack) && this.user.test(entity, entity)
|
||||
&& (desu == null || desu == ItemManaGun.isSugoiKawaiiDesuNe(stack));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -64,7 +64,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable {
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state) {
|
||||
return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0;
|
||||
return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : super.getLightValue(state);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -94,10 +94,12 @@ public class BlockAltar extends BlockMod {
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state, ILightReader world, @Nonnull BlockPos pos) {
|
||||
if(world.getBlockState(pos).getBlock() != this)
|
||||
return world.getBlockState(pos).getLightValue(world, pos);
|
||||
TileAltar tile = (TileAltar) world.getTileEntity(pos);
|
||||
return tile != null && tile.getFluid() == Fluids.LAVA ? 15 : 0;
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
if (te instanceof TileAltar && ((TileAltar) te).getFluid() == Fluids.LAVA) {
|
||||
return 15;
|
||||
} else {
|
||||
return super.getLightValue(state, world, pos);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -47,12 +47,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
|
||||
this.teProvider = teProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state, ILightReader world, @Nonnull BlockPos pos) {
|
||||
TileEntity tile = world.getTileEntity(pos);
|
||||
return tile instanceof TileEntitySpecialFlower ? ((TileEntitySpecialFlower) tile).getLightValue() : lightValue;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasComparatorInputOverride(BlockState state) {
|
||||
return true;
|
||||
|
||||
@@ -61,14 +61,6 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH
|
||||
return SHAPE.withOffset(shift.x, shift.y, shift.z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state, ILightReader world, @Nonnull BlockPos pos) {
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
if (te instanceof TileEntitySpecialFlower) {
|
||||
return ((TileEntitySpecialFlower) te).getLightValue();
|
||||
} else return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasComparatorInputOverride(BlockState state) {
|
||||
return true;
|
||||
|
||||
@@ -90,21 +90,16 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary,
|
||||
if(world.isRemote || stack.isEmpty() || !item.isAlive())
|
||||
return false;
|
||||
|
||||
if(getBlockState().getBlock() == ModBlocks.defaultAltar && stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) {
|
||||
ItemStack[] tmp = new ItemStack[getSizeInventory()];
|
||||
for(int i = 0; i < getSizeInventory(); i++) {
|
||||
tmp[i] = itemHandler.getStackInSlot(i);
|
||||
itemHandler.setStackInSlot(i, ItemStack.EMPTY);
|
||||
}
|
||||
if(getBlockState().getBlock() == ModBlocks.defaultAltar && stack.getItem() == Blocks.VINE.asItem()) {
|
||||
CompoundNBT tmp = new CompoundNBT();
|
||||
writePacketNBT(tmp);
|
||||
|
||||
stack.shrink(1);
|
||||
world.setBlockState(getPos(), ModBlocks.mossyAltar.getDefaultState());
|
||||
|
||||
TileEntity newAltar = world.getTileEntity(getPos());
|
||||
if(newAltar instanceof TileAltar) {
|
||||
for(int i = 0; i < getSizeInventory(); i++) {
|
||||
((TileAltar) newAltar).getItemHandler().setStackInSlot(i, tmp[i]);
|
||||
}
|
||||
((TileAltar) newAltar).readPacketNBT(tmp);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
package vazkii.botania.common.block.tile;
|
||||
|
||||
import com.google.common.base.Predicates;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.item.ItemEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -22,7 +20,6 @@ import net.minecraft.tileentity.TileEntityType;
|
||||
import net.minecraft.util.LazyValue;
|
||||
import net.minecraft.util.SoundCategory;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.registries.ObjectHolder;
|
||||
import vazkii.botania.api.internal.VanillaPacketDispatcher;
|
||||
import vazkii.botania.api.mana.IManaPool;
|
||||
@@ -61,9 +58,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab
|
||||
}
|
||||
},
|
||||
'P', ModBlocks.terraPlate,
|
||||
'R', ModBlocks.livingrock,
|
||||
'0', ModBlocks.livingrock,
|
||||
'L', Blocks.LAPIS_BLOCK
|
||||
'R', "#botania:terra_plate_base",
|
||||
'0', "#botania:terra_plate_base",
|
||||
'L', "#forge:storage_blocks/lapis"
|
||||
));
|
||||
|
||||
private static final String TAG_MANA = "mana";
|
||||
|
||||
@@ -497,8 +497,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
}
|
||||
|
||||
private EntityManaBurst getBurst(boolean fake) {
|
||||
EntityManaBurst burst = new EntityManaBurst(this, fake);
|
||||
|
||||
boolean dreamwood = isDreamwood();
|
||||
boolean ultra = isULTRA_SPREADER();
|
||||
int maxMana = ultra ? 640 : dreamwood ? 240 : 160;
|
||||
@@ -513,8 +511,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
|
||||
if(!lens.isEmpty() && lens.getItem() instanceof ILensEffect)
|
||||
((ILensEffect) lens.getItem()).apply(lens, props);
|
||||
|
||||
burst.setSourceLens(lens);
|
||||
if(getCurrentMana() >= props.maxMana || fake) {
|
||||
EntityManaBurst burst = new EntityManaBurst(this, fake);
|
||||
burst.setSourceLens(lens);
|
||||
|
||||
if(mapmakerOverride) {
|
||||
burst.setColor(mmForcedColor);
|
||||
burst.setMana(mmForcedManaPayload);
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
package vazkii.botania.common.crafting;
|
||||
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.item.crafting.Ingredient;
|
||||
@@ -98,10 +97,11 @@ public final class ModManaAlchemyRecipes {
|
||||
Blocks.SUNFLOWER, Blocks.LILAC, Blocks.ROSE_BUSH, Blocks.PEONY);
|
||||
|
||||
evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("chorus_fruit_to_flower"), new ItemStack(Blocks.CHORUS_FLOWER), Ingredient.fromItems(Items.POPPED_CHORUS_FRUIT), 10000));
|
||||
|
||||
|
||||
if(Botania.gardenOfGlassLoaded) {
|
||||
evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_shard_gog"), new ItemStack(Items.PRISMARINE_SHARD), Ingredient.fromItems(Items.QUARTZ), 1000));
|
||||
evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("prismarine_crystals_gog"), new ItemStack(Items.PRISMARINE_CRYSTALS), Ingredient.fromItems(Items.PRISMARINE_SHARD), 500));
|
||||
evt.manaInfusion().accept(RecipeManaInfusion.alchemy(prefix("heart_of_the_sea"), new ItemStack(Items.HEART_OF_THE_SEA), Ingredient.fromItems(Items.NAUTILUS_SHELL), 20000));
|
||||
}
|
||||
|
||||
evt.manaInfusion().accept(mini(ModSubtiles.agricarnationChibi, ModSubtiles.agricarnation));
|
||||
|
||||
@@ -54,7 +54,7 @@ public class ItemLexicon extends Item implements IElvenItem {
|
||||
addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "elven"), (stack, world, living) -> isElvenItem(stack) ? 1 : 0);
|
||||
}
|
||||
|
||||
private static Book getBook() {
|
||||
public static Book getBook() {
|
||||
return BookRegistry.INSTANCE.books.get(ModItems.lexicon.getRegistryName());
|
||||
}
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ import vazkii.botania.api.mana.ILens;
|
||||
import vazkii.botania.api.mana.IManaUsingItem;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
|
||||
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
|
||||
import vazkii.botania.common.advancements.ManaGunTrigger;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.entity.EntityManaBurst;
|
||||
@@ -91,7 +91,7 @@ public class ItemManaGun extends Item implements IManaUsingItem {
|
||||
if(!world.isRemote) {
|
||||
world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1);
|
||||
world.addEntity(burst);
|
||||
UseItemSuccessTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack, (ServerWorld) world, player.getX(), player.getY(), player.getZ());
|
||||
ManaGunTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack);
|
||||
} else {
|
||||
player.swingArm(hand);
|
||||
player.setMotion(player.getMotion().subtract(burst.getMotion().mul(0.1, 0.3, 0.1)));
|
||||
|
||||
@@ -16,7 +16,6 @@ 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.ItemStack;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.item.crafting.IRecipeSerializer;
|
||||
import net.minecraft.potion.EffectInstance;
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.util.text.TranslationTextComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
@@ -64,8 +65,10 @@ public class ItemLens extends Item implements ILensControl, ICompositableLens, I
|
||||
@Override
|
||||
public void addInformation(ItemStack par1ItemStack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
|
||||
int storedColor = getStoredColor(par1ItemStack);
|
||||
if(storedColor != -1)
|
||||
stacks.add(new TranslationTextComponent("botaniamisc.color", new TranslationTextComponent("botania.color" + storedColor)));
|
||||
if(storedColor != -1) {
|
||||
TranslationTextComponent colorName = new TranslationTextComponent(storedColor == 16 ? "botania.color.rainbow" : "color.minecraft." + DyeColor.byId(storedColor));
|
||||
stacks.add(new TranslationTextComponent("botaniamisc.color", colorName).applyTextStyle(TextFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
|
||||
@@ -36,8 +36,12 @@ public class LensDamage extends Lens {
|
||||
int mana = burst.getMana();
|
||||
if(mana >= 16) {
|
||||
burst.setMana(mana - 16);
|
||||
if(!burst.isFake())
|
||||
living.attackEntityFrom(DamageSource.MAGIC, 8);
|
||||
if(!burst.isFake()) {
|
||||
DamageSource src = entity.getThrower() != null
|
||||
? DamageSource.causeIndirectMagicDamage(entity, entity.getThrower())
|
||||
: DamageSource.MAGIC;
|
||||
living.attackEntityFrom(src, 8);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.lens;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.projectile.ThrowableEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
@@ -25,9 +26,11 @@ public class LensExplosive extends Lens {
|
||||
public boolean collideBurst(IManaBurst burst, ThrowableEntity entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) {
|
||||
if(!entity.world.isRemote && !burst.isFake() && pos.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockPos coords = burst.getBurstSourceBlockPos();
|
||||
if(!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos()))
|
||||
entity.world.createExplosion(entity, entity.getX(), entity.getY(), entity.getZ(),
|
||||
if(!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos())) {
|
||||
Entity cause = entity.getThrower() != null ? entity.getThrower() : entity;
|
||||
entity.world.createExplosion(cause, entity.getX(), entity.getY(), entity.getZ(),
|
||||
burst.getMana() / 50F, Explosion.Mode.BREAK);
|
||||
}
|
||||
} else dead = false;
|
||||
|
||||
return dead;
|
||||
|
||||
Reference in new issue
Block a user