mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 03:15:07 +00:00
Merge 1.14
This commit is contained in:
commit
e5c5a37f27
35 files changed
+177
-104
No files matched your search
@@ -14,6 +14,7 @@ import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -34,7 +35,10 @@ public interface IWireframeCoordinateListProvider {
|
||||
* This is useful to indicate the precedence of some position over the others.
|
||||
* @return The position of a single wireframe to draw thicker than all the others.
|
||||
*/
|
||||
public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack);
|
||||
@Nullable
|
||||
default BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -47,19 +47,6 @@ public class ContainerBaubleBox extends Container {
|
||||
this.box = box;
|
||||
IItemHandlerModifiable baubleBoxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
|
||||
|
||||
/* todo 1.13 remove these slots from the gui texture and provide a button to open curios gui instead
|
||||
baubles = BaublesApi.getBaublesHandler(player);
|
||||
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 0, 8, 8 + 0 * 18));
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 1, 8, 8 + 1 * 18));
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 2, 8, 8 + 2 * 18));
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 3, 8, 8 + 3 * 18));
|
||||
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 4, 27, 8 + 0 * 18));
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 5, 27, 8 + 1 * 18));
|
||||
addSlotToContainer(new SlotBauble(player, baubles, 6, 27, 8 + 2 * 18));
|
||||
*/
|
||||
|
||||
for(i = 0; i < 4; ++i)
|
||||
for(j = 0; j < 6; ++j) {
|
||||
int k = j + i * 6;
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
|
||||
import net.minecraft.client.gui.screen.inventory.InventoryScreen;
|
||||
import net.minecraft.entity.player.PlayerInventory;
|
||||
import net.minecraft.inventory.container.Slot;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -23,6 +24,8 @@ import vazkii.botania.client.lib.LibResources;
|
||||
public class GuiBaubleBox extends ContainerScreen<ContainerBaubleBox> {
|
||||
|
||||
private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX);
|
||||
private int mouseX;
|
||||
private int mouseY;
|
||||
|
||||
public GuiBaubleBox(ContainerBaubleBox container, PlayerInventory player, ITextComponent title) {
|
||||
super(container, player, title);
|
||||
@@ -32,6 +35,8 @@ public class GuiBaubleBox extends ContainerScreen<ContainerBaubleBox> {
|
||||
public void render(int mouseX, int mouseY, float partialTicks) {
|
||||
this.renderBackground();
|
||||
super.render(mouseX, mouseY, partialTicks);
|
||||
this.mouseX = mouseX;
|
||||
this.mouseY = mouseY;
|
||||
this.renderHoveredToolTip(mouseX, mouseY);
|
||||
}
|
||||
|
||||
@@ -40,12 +45,7 @@ public class GuiBaubleBox extends ContainerScreen<ContainerBaubleBox> {
|
||||
RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
Minecraft.getInstance().getTextureManager().bindTexture(texture);
|
||||
blit(guiLeft, guiTop, 0, 0, xSize, ySize);
|
||||
|
||||
for(int i1 = 0; i1 < 7; ++i1) {
|
||||
Slot slot = container.inventorySlots.get(i1);
|
||||
if(slot.getHasStack() && slot.getSlotStackLimit() == 1)
|
||||
blit(guiLeft+slot.xPos, guiTop+slot.yPos, 200, 0, 16, 16);
|
||||
}
|
||||
InventoryScreen.drawEntityOnScreen(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -110,7 +110,9 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision
|
||||
BlockItemUseContext ctx = new BlockItemUseContext(world, player, hand, currentStack, hit);
|
||||
BlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(ctx);
|
||||
|
||||
if(isValidBlock(changeState, world, pos) && !(changeState.getBlock() instanceof BlockPlatform) && changeState.getMaterial() != Material.AIR) {
|
||||
if(changeState != null && isValidBlock(changeState, world, pos)
|
||||
&& !(changeState.getBlock() instanceof BlockPlatform)
|
||||
&& changeState.getMaterial() != Material.AIR) {
|
||||
if (!world.isRemote) {
|
||||
camo.camoState = changeState;
|
||||
world.notifyBlockUpdate(pos, state, state, 3);
|
||||
|
||||
+23
-5
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.functional;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
@@ -17,6 +18,8 @@ import net.minecraft.block.BushBlock;
|
||||
import net.minecraft.block.CropsBlock;
|
||||
import net.minecraft.block.IGrowable;
|
||||
import net.minecraft.block.SaplingBlock;
|
||||
import net.minecraft.block.SeaPickleBlock;
|
||||
import net.minecraft.block.SweetBerryBushBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
@@ -29,14 +32,18 @@ import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
public class SubTileAgricarnation extends TileEntityFunctionalFlower {
|
||||
@ObjectHolder(LibMisc.MOD_ID + ":agricarnation")
|
||||
public static TileEntityType<SubTileAgricarnation> TYPE;
|
||||
|
||||
private static final Set<Material> MATERIALS = ImmutableSet.of(Material.PLANTS, Material.CACTUS, Material.ORGANIC,
|
||||
Material.LEAVES, Material.GOURD, Material.OCEAN_PLANT, Material.BAMBOO);
|
||||
private static final int RANGE = 5;
|
||||
private static final int RANGE_MINI = 2;
|
||||
|
||||
public SubTileAgricarnation(TileEntityType<?> type) {
|
||||
protected SubTileAgricarnation(TileEntityType<?> type) {
|
||||
super(type);
|
||||
}
|
||||
|
||||
@@ -84,16 +91,27 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Whether the block at {@code pos} grows "naturally". That is, whether its IGrowable action is simply
|
||||
* growing itself, instead of something like spreading around or creating flowers around, etc, and whether this
|
||||
* action would have happened normally over time without bonemeal.
|
||||
*/
|
||||
private boolean isPlant(BlockPos pos) {
|
||||
BlockState state = getWorld().getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
if(block == Blocks.GRASS_BLOCK || BlockTags.LEAVES.contains(block) || block instanceof BushBlock && !(block instanceof CropsBlock) && !(block instanceof SaplingBlock))
|
||||
|
||||
// Grass spreads when ticked
|
||||
if(block == Blocks.GRASS_BLOCK)
|
||||
return false;
|
||||
|
||||
Material mat = state.getMaterial();
|
||||
return (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.ORGANIC || mat == Material.LEAVES || mat == Material.GOURD)
|
||||
// Exclude all BushBlock except known vanilla subclasses
|
||||
if (block instanceof BushBlock && !(block instanceof CropsBlock)
|
||||
&& !(block instanceof SaplingBlock) && !(block instanceof SweetBerryBushBlock))
|
||||
return false;
|
||||
|
||||
return MATERIALS.contains(state.getMaterial())
|
||||
&& block instanceof IGrowable
|
||||
&& ((IGrowable) block).canGrow(getWorld(), pos, getWorld().getBlockState(pos), getWorld().isRemote);
|
||||
&& ((IGrowable) block).canGrow(getWorld(), pos, state, getWorld().isRemote);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.subtile.generating;
|
||||
|
||||
import net.minecraft.entity.SpawnReason;
|
||||
import net.minecraft.entity.monster.SlimeEntity;
|
||||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
@@ -94,6 +95,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower {
|
||||
@SubscribeEvent
|
||||
public static void onSpawn(LivingSpawnEvent.CheckSpawn event) {
|
||||
if(event.getEntityLiving() instanceof SlimeEntity
|
||||
&& event.getSpawnReason() == SpawnReason.NATURAL
|
||||
&& event.getResult() != Event.Result.DENY
|
||||
&& isSlimeChunk(event.getEntityLiving().world, event.getX(), event.getZ()))
|
||||
event.getEntityLiving().getPersistentData().putBoolean(TAG_WORLD_SPAWNED, true);
|
||||
|
||||
@@ -123,6 +123,7 @@ public class TileCocoon extends TileMod implements ITickableTileEntity{
|
||||
if(entity instanceof AgeableEntity)
|
||||
((AgeableEntity) entity).setGrowingAge(-24000);
|
||||
entity.onInitialSpawn(world, world.getDifficultyForLocation(getPos()), SpawnReason.EVENT, null, null);
|
||||
entity.enablePersistence();
|
||||
world.addEntity(entity);
|
||||
entity.spawnExplosionParticle();
|
||||
}
|
||||
|
||||
@@ -52,8 +52,8 @@ public class TileEnderEye extends TileMod implements ITickableTileEntity {
|
||||
if(!helm.isEmpty() && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN))
|
||||
continue;
|
||||
|
||||
RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 64);
|
||||
if(pos.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) pos).getPos().equals(getPos())) {
|
||||
BlockRayTraceResult hit = ToolCommons.raytraceFromEntity(player, 64, false);
|
||||
if(hit.getType() == RayTraceResult.Type.BLOCK && hit.getPos().equals(getPos())) {
|
||||
looking = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -81,7 +81,8 @@ public class ExoflameFurnaceHandler {
|
||||
this.recipeType = ExoflameFurnaceHandler.getRecipeType(furnace);
|
||||
}
|
||||
if (currentRecipe != null) { // This is already more caching than Mojang does
|
||||
if(ExoflameFurnaceHandler.canSmelt(furnace, currentRecipe)) {
|
||||
if(currentRecipe.matches(furnace, furnace.getWorld())
|
||||
&& ExoflameFurnaceHandler.canSmelt(furnace, currentRecipe)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,6 +126,7 @@ public final class PlayerHelper {
|
||||
if(ctx.getPlayer() != null) {
|
||||
save = ctx.getPlayer().getHeldItem(ctx.getHand());
|
||||
ctx.getPlayer().setHeldItem(ctx.getHand(), toUse);
|
||||
// Need to construct a new one still to refresh the itemstack
|
||||
newCtx = new ItemUseContext(ctx.getPlayer(), ctx.getHand(), hit);
|
||||
} else {
|
||||
newCtx = new ItemUseContext(ctx.getWorld(), null, ctx.getHand(), toUse, hit);
|
||||
|
||||
@@ -19,7 +19,6 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.mana.ICompositableLens;
|
||||
import vazkii.botania.common.item.lens.ItemLens;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@@ -74,7 +73,7 @@ public class CompositeLensRecipe extends SpecialRecipe {
|
||||
return ItemStack.EMPTY;
|
||||
|
||||
ItemStack lensCopy = lens.copy();
|
||||
((ItemLens) lens.getItem()).setCompositeLens(lensCopy, secondLens);
|
||||
lensItem.setCompositeLens(lensCopy, secondLens);
|
||||
|
||||
return lensCopy;
|
||||
}
|
||||
|
||||
@@ -126,11 +126,10 @@ public class EntityBabylonWeapon extends EntityThrowableCopy {
|
||||
setMotion(Vec3d.ZERO);
|
||||
} else if (liveTime == delay && player != null) {
|
||||
Vector3 playerLook;
|
||||
RayTraceResult lookat = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 64);
|
||||
if(lookat.getType() != RayTraceResult.Type.BLOCK)
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 64, true);
|
||||
if(rtr.getType() != RayTraceResult.Type.BLOCK)
|
||||
playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player));
|
||||
else {
|
||||
BlockRayTraceResult rtr = (BlockRayTraceResult) lookat;
|
||||
playerLook = new Vector3(rtr.getPos().getX() + 0.5, rtr.getPos().getY() + 0.5, rtr.getPos().getZ() + 0.5);
|
||||
}
|
||||
|
||||
|
||||
@@ -58,6 +58,7 @@ import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet;
|
||||
import vazkii.botania.common.item.lens.LensWarp;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -563,6 +564,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
|
||||
}
|
||||
|
||||
private void onRecieverImpact(IManaReceiver tile, BlockPos pos) {
|
||||
if (getPersistentData().getBoolean(LensWarp.TAG_WARPED))
|
||||
return;
|
||||
|
||||
ILensEffect lens = getLensInstance();
|
||||
int mana = getMana();
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@ public class ItemAstrolabe extends Item {
|
||||
|
||||
public static List<BlockPos> getBlocksToPlace(ItemStack stack, PlayerEntity player) {
|
||||
List<BlockPos> coords = new ArrayList<>();
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 5);
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 5, true);
|
||||
if(rtr.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockPos pos = rtr.getPos();
|
||||
BlockState state = player.world.getBlockState(pos);
|
||||
|
||||
@@ -139,10 +139,10 @@ public class ItemSextant extends Item {
|
||||
public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) {
|
||||
ItemStack stack = player.getHeldItem(hand);
|
||||
if(!player.isSneaking()) {
|
||||
RayTraceResult rtr = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 128);
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 128, false);
|
||||
if(rtr.getType() == RayTraceResult.Type.BLOCK) {
|
||||
if(!world.isRemote) {
|
||||
BlockPos pos = ((BlockRayTraceResult) rtr).getPos();
|
||||
BlockPos pos = rtr.getPos();
|
||||
ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.getX());
|
||||
ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.getY());
|
||||
ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.getZ());
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.tags.Tag;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
@@ -23,6 +24,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
@@ -60,4 +63,19 @@ public class ItemBlockSpecialFlower extends BlockItem {
|
||||
tooltip.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean showDurabilityBar(ItemStack stack) {
|
||||
CompoundNBT tag = stack.getChildTag("BlockEntityTag");
|
||||
return tag != null && tag.contains(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS);
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getDurabilityForDisplay(ItemStack stack) {
|
||||
CompoundNBT tag = stack.getChildTag("BlockEntityTag");
|
||||
if (tag != null) {
|
||||
return tag.getInt(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS) / (double) BotaniaAPI.internalHandler.getPassiveFlowerDecay();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -267,7 +267,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
Vector3 look = new Vector3(p.getLookVec()).multiply(1, 0, 1).normalize();
|
||||
|
||||
if(flying) {
|
||||
if(time > 0 && !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false))
|
||||
if(time > 0 && !p.isSpectator() && !p.isCreative()
|
||||
&& !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false))
|
||||
newTime--;
|
||||
final int maxCd = 80;
|
||||
int cooldown = ItemNBTHelper.getInt(stack, TAG_DASH_COOLDOWN, 0);
|
||||
|
||||
@@ -41,12 +41,11 @@ public class ItemSwapRing extends ItemBauble {
|
||||
|
||||
ISortableTool tool = (ISortableTool) currentStack.getItem();
|
||||
|
||||
RayTraceResult pos = ToolCommons.raytraceFromEntity(player.world, player,
|
||||
RayTraceContext.FluidMode.NONE, 4.5F);
|
||||
BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 4.5F, false);
|
||||
ToolType typeToFind = null;
|
||||
|
||||
if(player.isSwingInProgress && pos.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockState state = entity.world.getBlockState(((BlockRayTraceResult) pos).getPos());
|
||||
BlockState state = entity.world.getBlockState(pos.getPos());
|
||||
|
||||
Material mat = state.getMaterial();
|
||||
if(ToolCommons.materialsPick.contains(mat))
|
||||
|
||||
@@ -43,9 +43,9 @@ public class ItemStarSword extends ItemManasteelSword {
|
||||
float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F;
|
||||
|
||||
if(player.getHeldItemMainhand() == stack && player.swingProgress == check && !world.isRemote) {
|
||||
RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 48);
|
||||
BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 48, false);
|
||||
if(pos.getType() == RayTraceResult.Type.BLOCK) {
|
||||
Vector3 posVec = Vector3.fromBlockPos(((BlockRayTraceResult) pos).getPos());
|
||||
Vector3 posVec = Vector3.fromBlockPos(pos.getPos());
|
||||
Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18);
|
||||
posVec = posVec.add(motVec);
|
||||
motVec = motVec.normalize().negate().multiply(1.5);
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.enchantment.Enchantments;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.player.ServerPlayerEntity;
|
||||
@@ -27,6 +28,7 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceContext;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.util.math.Vec3i;
|
||||
import net.minecraft.world.World;
|
||||
@@ -155,19 +157,11 @@ public final class ToolCommons {
|
||||
return materialLevel * 100 + modifier * 10 + efficiency;
|
||||
}
|
||||
|
||||
// [VanillaCopy] of Item.rayTrace, edits noted
|
||||
public static BlockRayTraceResult raytraceFromEntity(World worldIn, PlayerEntity player, RayTraceContext.FluidMode fluidMode, double range) {
|
||||
float f = player.rotationPitch;
|
||||
float f1 = player.rotationYaw;
|
||||
Vec3d vec3d = player.getEyePosition(1.0F);
|
||||
float f2 = MathHelper.cos(-f1 * ((float)Math.PI / 180F) - (float)Math.PI);
|
||||
float f3 = MathHelper.sin(-f1 * ((float)Math.PI / 180F) - (float)Math.PI);
|
||||
float f4 = -MathHelper.cos(-f * ((float)Math.PI / 180F));
|
||||
float f5 = MathHelper.sin(-f * ((float)Math.PI / 180F));
|
||||
float f6 = f3 * f4;
|
||||
float f7 = f2 * f4;
|
||||
double d0 = range; // Botania - use custom range
|
||||
Vec3d vec3d1 = vec3d.add((double)f6 * d0, (double)f5 * d0, (double)f7 * d0);
|
||||
return worldIn.rayTraceBlocks(new RayTraceContext(vec3d, vec3d1, RayTraceContext.BlockMode.OUTLINE, fluidMode, player));
|
||||
// [VanillaCopy] Exact Entity.func_213324_a but available serverside, partialTicks fixed to 1, and narrowed return type
|
||||
public static BlockRayTraceResult raytraceFromEntity(Entity e, double distance, boolean fluids) {
|
||||
Vec3d vec3d = e.getEyePosition(1);
|
||||
Vec3d vec3d1 = e.getLook(1);
|
||||
Vec3d vec3d2 = vec3d.add(vec3d1.x * distance, vec3d1.y * distance, vec3d1.z * distance);
|
||||
return e.world.rayTraceBlocks(new RayTraceContext(vec3d, vec3d2, RayTraceContext.BlockMode.OUTLINE, fluids ? RayTraceContext.FluidMode.ANY : RayTraceContext.FluidMode.NONE, e));
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -90,9 +90,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
|
||||
|
||||
@Override
|
||||
public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) {
|
||||
RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10);
|
||||
BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false);
|
||||
if(raycast.getType() == RayTraceResult.Type.BLOCK) {
|
||||
Direction face = ((BlockRayTraceResult) raycast).getFace();
|
||||
Direction face = raycast.getFace();
|
||||
breakOtherBlock(player, stack, pos, pos, face);
|
||||
ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face);
|
||||
}
|
||||
|
||||
+2
-4
@@ -148,9 +148,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
|
||||
|
||||
@Override
|
||||
public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) {
|
||||
RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10);
|
||||
BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false);
|
||||
if(!player.world.isRemote && raycast.getType() == RayTraceResult.Type.BLOCK) {
|
||||
Direction face = ((BlockRayTraceResult) raycast).getFace();
|
||||
Direction face = raycast.getFace();
|
||||
breakOtherBlock(player, stack, pos, pos, face);
|
||||
ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face);
|
||||
// ^ Doable with API access through the IInternalMethodHandler.
|
||||
@@ -177,8 +177,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
|
||||
if(world.isAirBlock(pos))
|
||||
return;
|
||||
|
||||
int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack);
|
||||
boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0;
|
||||
boolean thor = !ItemThorRing.getThorRing(player).isEmpty();
|
||||
boolean doX = thor || side.getXOffset() == 0;
|
||||
boolean doY = thor || side.getYOffset() == 0;
|
||||
|
||||
@@ -37,7 +37,7 @@ public class Lens {
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {}
|
||||
|
||||
public int getManaToTransfer(IManaBurst burst, ThrowableEntity entity, ItemStack stack, IManaReceiver receiver) {
|
||||
return entity.getPersistentData().getBoolean(LensWarp.TAG_WARPED) ? 0 : burst.getMana();
|
||||
return burst.getMana();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class LensRedirect extends Lens {
|
||||
VoxelShape collideShape = entity.world.getBlockState(coords).getCollisionShape(entity.world, coords);
|
||||
if(collideShape.isEmpty())
|
||||
axis = new AxisAlignedBB(coords, coords.add(1, 1, 1));
|
||||
else axis = collideShape.getBoundingBox(); // todo 1.13 more granular collisions?
|
||||
else axis = collideShape.getBoundingBox().offset(coords); // todo 1.13 more granular collisions?
|
||||
|
||||
if(!sourceVec.isInside(axis))
|
||||
sourceVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2);
|
||||
|
||||
@@ -24,8 +24,9 @@ import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceContext;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
@@ -37,6 +38,7 @@ import vazkii.botania.api.mana.IManaUsingItem;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.common.core.handler.EquipmentHandler;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.core.helper.PlayerHelper;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.tool.ToolCommons;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
@@ -68,35 +70,33 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
|
||||
if(lokiRing.isEmpty() || !player.isSneaking())
|
||||
return;
|
||||
|
||||
ItemStack heldItemStack = event.getItemStack();
|
||||
BlockPos originCoords = getOriginPos(lokiRing);
|
||||
RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.ANY, 10F);
|
||||
ItemStack stack = event.getItemStack();
|
||||
BlockRayTraceResult lookPos = ToolCommons.raytraceFromEntity(player, 10F, true);
|
||||
List<BlockPos> cursors = getCursorList(lokiRing);
|
||||
int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25));
|
||||
|
||||
if(lookPos.getType() != RayTraceResult.Type.BLOCK)
|
||||
return;
|
||||
|
||||
BlockPos hit = ((BlockRayTraceResult) lookPos).getPos();
|
||||
if(heldItemStack.isEmpty()) {
|
||||
BlockPos hit = lookPos.getPos();
|
||||
if(stack.isEmpty()) {
|
||||
BlockPos originCoords = getOriginPos(lokiRing);
|
||||
if(!event.getWorld().isRemote) {
|
||||
if(originCoords.getY() == -1) {
|
||||
// Initiate a new pending list of positions
|
||||
setOriginPos(lokiRing, hit);
|
||||
setCursorList(lokiRing, null);
|
||||
} else {
|
||||
if(originCoords.equals(hit)) {
|
||||
// Finalize the pending list of positions
|
||||
setOriginPos(lokiRing, new BlockPos(0, -1, 0));
|
||||
} else {
|
||||
addCursor : {
|
||||
BlockPos relPos = hit.subtract(originCoords);
|
||||
|
||||
for(BlockPos cursor : cursors)
|
||||
if(cursor.equals(relPos)) {
|
||||
cursors.remove(cursor);
|
||||
setCursorList(lokiRing, cursors);
|
||||
break addCursor;
|
||||
}
|
||||
// Toggle offsets on or off from the pending list of positions
|
||||
BlockPos relPos = hit.subtract(originCoords);
|
||||
|
||||
if (cursors.remove(relPos)) {
|
||||
setCursorList(lokiRing, cursors);
|
||||
} else {
|
||||
addCursor(lokiRing, relPos);
|
||||
}
|
||||
}
|
||||
@@ -106,16 +106,25 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
|
||||
event.setCanceled(true);
|
||||
event.setCancellationResult(ActionResultType.SUCCESS);
|
||||
} else {
|
||||
ItemStack original = stack.copy();
|
||||
for(BlockPos cursor : cursors) {
|
||||
BlockPos pos = hit.add(cursor);
|
||||
if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) {
|
||||
ItemStack saveHeld = heldItemStack.copy();
|
||||
BlockRayTraceResult newHit = new BlockRayTraceResult(
|
||||
lookPos.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ()),
|
||||
((BlockRayTraceResult) lookPos).getFace(), pos, false);
|
||||
heldItemStack.onItemUse(new ItemUseContext(player, event.getHand(), newHit));
|
||||
if(player.isCreative())
|
||||
player.setHeldItem(event.getHand(), saveHeld);
|
||||
if(ManaItemHandler.requestManaExact(lokiRing, player, cost, false)) {
|
||||
Vec3d lookHit = lookPos.getHitVec();
|
||||
Vec3d newHitVec = new Vec3d(pos.getX() + MathHelper.frac(lookHit.getX()), pos.getY() + MathHelper.frac(lookHit.getY()), pos.getZ() + MathHelper.frac(lookHit.getZ()));
|
||||
BlockRayTraceResult newHit = new BlockRayTraceResult(newHitVec, lookPos.getFace(), pos, false);
|
||||
ItemUseContext ctx = new ItemUseContext(player, event.getHand(), newHit);
|
||||
|
||||
ActionResultType result;
|
||||
if (player.isCreative()) {
|
||||
result = PlayerHelper.substituteUse(ctx, original.copy());
|
||||
} else {
|
||||
result = stack.onItemUse(ctx);
|
||||
}
|
||||
|
||||
if (result == ActionResultType.SUCCESS) {
|
||||
ManaItemHandler.requestManaExact(lokiRing, player, cost, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -173,8 +182,21 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
|
||||
}
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) {
|
||||
return getLokiRing(player) == stack ? getOriginPos(stack) : null;
|
||||
Minecraft mc = Minecraft.getInstance();
|
||||
if (getLokiRing(player) == stack) {
|
||||
BlockPos currentBuildCenter = getOriginPos(stack);
|
||||
if (currentBuildCenter.getY() != -1) {
|
||||
return currentBuildCenter;
|
||||
} else if (mc.objectMouseOver instanceof BlockRayTraceResult
|
||||
&& mc.objectMouseOver.getType() == RayTraceResult.Type.BLOCK
|
||||
&& !getCursorList(stack).isEmpty()) {
|
||||
return ((BlockRayTraceResult) mc.objectMouseOver).getPos();
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static ItemStack getLokiRing(PlayerEntity player) {
|
||||
|
||||
@@ -383,9 +383,4 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC
|
||||
return ImmutableList.of();
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -79,10 +79,9 @@ public class ItemSmeltRod extends Item implements IManaUsingItem {
|
||||
if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false))
|
||||
return;
|
||||
|
||||
RayTraceResult ray = ToolCommons.raytraceFromEntity(p.world, p, RayTraceContext.FluidMode.NONE, 32);
|
||||
BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(p, 32, false);
|
||||
|
||||
if(ray.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockRayTraceResult pos = (BlockRayTraceResult) ray;
|
||||
if(pos.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockState state = p.world.getBlockState(pos.getPos());
|
||||
|
||||
dummyInv.setInventorySlotContents(0, new ItemStack(state.getBlock()));
|
||||
|
||||
@@ -104,8 +104,7 @@ public final class SkyblockWorldEvents {
|
||||
event.setCancellationResult(ActionResultType.SUCCESS);
|
||||
}
|
||||
} else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) {
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), player,
|
||||
RayTraceContext.FluidMode.SOURCE_ONLY, 4.5F);
|
||||
BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 4.5F, true);
|
||||
if(rtr.getType() == RayTraceResult.Type.BLOCK) {
|
||||
BlockPos pos = rtr.getPos();
|
||||
if(event.getWorld().getBlockState(pos).getMaterial() == Material.WATER) {
|
||||
|
||||
Reference in new issue
Block a user