Reimplement sextant using patchouli multiblocks

This commit is contained in:
Vincent Lee committed 2019-12-10 16:43:02 -06:00
1 parent ca2458a061
commit ffa3bc91dd
5 files changed
+66 -9

No files matched your search

+1 -1
View File
@@ -98,7 +98,7 @@ repositories {
dependencies {
minecraft "net.minecraftforge:forge:${config.mc_version}-${config.forge_version}"
compile fg.deobf("vazkii.patchouli:Patchouli:1.1-22.37") { transitive = false }
compile fg.deobf("vazkii.patchouli:Patchouli:1.1-22.43") { transitive = false }
compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11")
+1 -1
View File
@@ -3,7 +3,7 @@
version=r1.10
mc_mappings=20191111-1.14.3
dir_output=../Build Output/Botania/
forge_version=28.1.70
forge_version=28.1.92
dir_repo=./
mc_version=1.14.4
build_number=369
@@ -19,6 +19,8 @@ import net.minecraft.client.util.InputMappings;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.particles.IParticleData;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.settings.KeyConflictContext;
import net.minecraftforge.common.MinecraftForge;
@@ -44,8 +46,11 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.core.proxy.IProxy;
import vazkii.botania.common.item.ItemSextant;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import vazkii.botania.common.lib.LibMisc;
import vazkii.patchouli.api.IMultiblock;
import vazkii.patchouli.client.handler.MultiblockVisualizationHandler;
import java.io.File;
import java.io.IOException;
@@ -187,5 +192,19 @@ public class ClientProxy implements IProxy {
public void addParticleForce(World world, IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {
world.addParticle(particleData, true, x, y, z, xSpeed, ySpeed, zSpeed);
}
@Override
public void showMultiblock(IMultiblock mb, String name, BlockPos anchor, Rotation rot) {
MultiblockVisualizationHandler.setMultiblock(mb, name, null, false);
MultiblockVisualizationHandler.anchorTo(anchor, Rotation.NONE);
}
@Override
public void clearSextantMultiblock() {
if (MultiblockVisualizationHandler.hasMultiblock
&& MultiblockVisualizationHandler.getMultiblock() != null
&& MultiblockVisualizationHandler.getMultiblock().getID().equals(ItemSextant.MULTIBLOCK_ID))
MultiblockVisualizationHandler.setMultiblock(null, null, null, true);
}
}
@@ -3,9 +3,12 @@ package vazkii.botania.common.core.proxy;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.particles.IParticleData;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import vazkii.botania.api.boss.IBotaniaBoss;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.patchouli.api.IMultiblock;
public interface IProxy {
default void registerHandlers() {}
@@ -34,4 +37,8 @@ public interface IProxy {
// Side-safe version of world.addParticle with noDistanceLimit flag set to true
default void addParticleForce(World world, IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) {}
default void showMultiblock(IMultiblock mb, String name, BlockPos anchor, Rotation rot) {}
default void clearSextantMultiblock() {}
}
@@ -11,6 +11,7 @@
package vazkii.botania.common.item;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.LivingEntity;
@@ -20,6 +21,8 @@ import net.minecraft.item.UseAction;
import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.Rotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceContext;
@@ -30,14 +33,23 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.fx.WispParticleData;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.equipment.tool.ToolCommons;
import vazkii.patchouli.api.IStateMatcher;
import vazkii.patchouli.api.PatchouliAPI;
import vazkii.patchouli.common.multiblock.AbstractMultiblock;
import javax.annotation.Nonnull;
import java.util.HashMap;
import java.util.Map;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
public class ItemSextant extends ItemMod {
public static final ResourceLocation MULTIBLOCK_ID = prefix("sextant");
private static final int MAX_RADIUS = 256;
private static final String TAG_SOURCE_X = "sourceX";
private static final String TAG_SOURCE_Y = "sourceY";
@@ -90,19 +102,37 @@ public class ItemSextant extends ItemMod {
double radius = calculateRadius(stack, (PlayerEntity) living);
if(1 < radius && radius <= MAX_RADIUS) {
IStateMatcher matcher = PatchouliAPI.instance.predicateMatcher(Blocks.COBBLESTONE, s -> !s.isAir());
int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0);
int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1);
int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0);
if(y != -1)
; // todo 1.14 use patchouli multiblocks Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.COBBLESTONE);
int iradius = (int) radius + 1;
if(y != -1) {
Map<BlockPos, IStateMatcher> map = new HashMap<>();
for(int i = 0; i < iradius * 2 + 1; i++)
for(int j = 0; j < iradius * 2 + 1; j++) {
int xp = x + i - iradius;
int zp = z + j - iradius;
if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == iradius - 1)
map.put(new BlockPos(xp - x, 0, zp - z), matcher);
}
AbstractMultiblock sparse = (AbstractMultiblock) PatchouliAPI.instance.makeSparseMultiblock(map).setResourceLocation(MULTIBLOCK_ID);
Botania.proxy.showMultiblock(sparse, "r = " + (int) radius, new BlockPos(x, y, z), Rotation.NONE);
}
}
}
private void reset(World world, ItemStack stack) {
ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, -1);
if (world.isRemote) {
Botania.proxy.clearSextantMultiblock();
}
}
@Nonnull
@Override
public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) {
// todo 1.14 use patchouli multiblocks Botania.proxy.removeSextantMultiblock();
ItemStack stack = player.getHeldItem(hand);
if(!player.isSneaking()) {
RayTraceResult rtr = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 128);
@@ -113,9 +143,10 @@ public class ItemSextant extends ItemMod {
ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.getY());
ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.getZ());
}
} else ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, -1);
player.setActiveHand(hand);
player.setActiveHand(hand);
}
} else {
reset(world, stack);
}
return ActionResult.newResult(ActionResultType.SUCCESS, stack);