Merge remote-tracking branch 'origin/master' into fabric-1.16
# Conflicts: # build.gradle # gradle.properties # src/api/java/appeng/api/config/Upgrades.java # src/api/java/appeng/api/recipes/ResolverResult.java # src/main/java/appeng/block/AEBaseBlockItemChargeable.java # src/main/java/appeng/block/crafting/CraftingStorageItem.java # src/main/java/appeng/block/misc/ChargerBlock.java # src/main/java/appeng/block/networking/CableBusBlock.java # src/main/java/appeng/block/storage/ChestBlock.java # src/main/java/appeng/block/storage/DriveSlotCellType.java # src/main/java/appeng/capabilities/Capabilities.java # src/main/java/appeng/client/me/ItemRepo.java # src/main/java/appeng/client/render/cablebus/FacadeBuilder.java # src/main/java/appeng/client/render/effects/ChargedOreFX.java # src/main/java/appeng/client/render/effects/CraftingFx.java # src/main/java/appeng/client/render/effects/EnergyFx.java # src/main/java/appeng/client/render/effects/LightningArcFX.java # src/main/java/appeng/client/render/effects/LightningFX.java # src/main/java/appeng/client/render/effects/MatterCannonFX.java # src/main/java/appeng/client/render/effects/VibrantFX.java # src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java # src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java # src/main/java/appeng/container/AEBaseContainer.java # src/main/java/appeng/container/implementations/CellWorkbenchContainer.java # src/main/java/appeng/container/implementations/MolecularAssemblerContainer.java # src/main/java/appeng/container/implementations/PatternTermContainer.java # src/main/java/appeng/container/implementations/QuartzKnifeContainer.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/core/AEItemGroup.java # src/main/java/appeng/core/Api.java # src/main/java/appeng/core/AppEng.java # src/main/java/appeng/core/Registration.java # src/main/java/appeng/core/api/definitions/ApiBlocks.java # src/main/java/appeng/core/api/definitions/ApiParts.java # src/main/java/appeng/core/features/registries/MovableTileRegistry.java # src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java # src/main/java/appeng/core/features/registries/WirelessRegistry.java # src/main/java/appeng/core/features/registries/WorldGenRegistry.java # src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java # src/main/java/appeng/core/sync/BasePacketHandler.java # src/main/java/appeng/core/sync/packets/ClickPacket.java # src/main/java/appeng/core/sync/packets/PatternSlotPacket.java # src/main/java/appeng/crafting/CraftingTreeProcess.java # src/main/java/appeng/debug/ReplicatorCardItem.java # src/main/java/appeng/entity/ChargedQuartzEntity.java # src/main/java/appeng/entity/SingularityEntity.java # src/main/java/appeng/entity/TinyTNTPrimedEntity.java # src/main/java/appeng/fluids/helper/DualityFluidInterface.java # src/main/java/appeng/fluids/helper/FluidCellConfig.java # src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java # src/main/java/appeng/fluids/parts/FluidHandlerAdapter.java # src/main/java/appeng/forge/data/providers/IAE2DataProvider.java # src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java # src/main/java/appeng/helpers/CraftingPatternDetails.java # src/main/java/appeng/helpers/DualityInterface.java # src/main/java/appeng/helpers/WirelessTerminalGuiObject.java # src/main/java/appeng/hooks/IBlockTool.java # src/main/java/appeng/hooks/TickHandler.java # src/main/java/appeng/integration/modules/jei/CondenserCategory.java # src/main/java/appeng/integration/modules/jei/JEIPlugin.java # src/main/java/appeng/items/misc/EncodedPatternItem.java # src/main/java/appeng/items/parts/FacadeItem.java # src/main/java/appeng/items/parts/PartItem.java # src/main/java/appeng/items/storage/AbstractStorageCell.java # src/main/java/appeng/items/storage/CreativeStorageCellItem.java # src/main/java/appeng/items/tools/powered/ColorApplicatorItem.java # src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java # src/main/java/appeng/items/tools/powered/MatterCannonItem.java # src/main/java/appeng/items/tools/powered/WirelessTerminalItem.java # src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java # src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java # src/main/java/appeng/parts/PartPlacement.java # src/main/java/appeng/parts/automation/FormationPlanePart.java # src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java # src/main/java/appeng/parts/reporting/PatternTerminalPart.java # src/main/java/appeng/spatial/CachedPlane.java # src/main/java/appeng/spatial/StorageChunkGenerator.java # src/main/java/appeng/spatial/StorageHelper.java # src/main/java/appeng/tile/crafting/CraftingBlockEntity.java # src/main/java/appeng/tile/crafting/CraftingStorageBlockEntity.java # src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java # src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java # src/main/java/appeng/tile/misc/ChargerBlockEntity.java # src/main/java/appeng/tile/misc/CondenserBlockEntity.java # src/main/java/appeng/tile/misc/InscriberBlockEntity.java # src/main/java/appeng/tile/misc/InscriberRecipes.java # src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java # src/main/java/appeng/tile/storage/ChestBlockEntity.java # src/main/java/appeng/tile/storage/DriveBlockEntity.java # src/main/java/appeng/util/Platform.java # src/main/java/team/chisel/ctm/api/IFacade.java # src/main/resources/assets/appliedenergistics2/models/block/chest/base.json # src/unported/java/appeng/client/render/FacadeItemModel.java # src/unported/java/appeng/client/render/model/DriveBakedModel.java # src/unported/java/appeng/client/render/model/DriveModel.java # src/unported/java/appeng/core/PluginLoader.java
This commit is contained in:
Sebastian Hartte
@@ -31,6 +31,7 @@ import net.minecraft.block.entity.BlockEntity;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.world.ServerWorld;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.minecraft.util.Util;
|
||||
import net.minecraft.util.math.Direction;
|
||||
@@ -56,10 +57,31 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(World worldIn, PlayerEntity playerIn, Hand handIn) {
|
||||
if (!worldIn.isRemote()) {
|
||||
final CompoundNBT tag = playerIn.getHeldItem(handIn).getOrCreateTag();
|
||||
final int replications;
|
||||
|
||||
if (tag.contains("r")) {
|
||||
replications = (tag.getInt("r") + 1) % 4;
|
||||
} else {
|
||||
replications = 0;
|
||||
}
|
||||
|
||||
tag.putInt("r", replications);
|
||||
|
||||
playerIn.sendMessage(new StringTextComponent((replications + 1) + "³ Replications"));
|
||||
}
|
||||
|
||||
return super.onItemRightClick(worldIn, playerIn, handIn);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ActionResult onItemUseFirst(ItemStack stack, ItemUsageContext context) {
|
||||
if (context.getWorld().isClient()) {
|
||||
return ActionResult.PASS;
|
||||
// Needed, otherwise client will trigger onItemRightClick also on server...
|
||||
return ActionResult.SUCCESS;
|
||||
}
|
||||
|
||||
PlayerEntity player = context.getPlayer();
|
||||
@@ -78,13 +100,15 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
|
||||
|
||||
if (player.isInSneakingPose()) {
|
||||
if (world.getBlockEntity(pos) instanceof IGridHost) {
|
||||
final CompoundTag tag = new CompoundTag();
|
||||
final CompoundTag tag = player.getStackInHand(hand).getOrCreateTag();
|
||||
tag.putInt("x", x);
|
||||
tag.putInt("y", y);
|
||||
tag.putInt("z", z);
|
||||
tag.putInt("side", side.ordinal());
|
||||
tag.putString("w", world.getRegistryKey().getValue().toString());
|
||||
player.getStackInHand(hand).setTag(tag);
|
||||
tag.putInt("r", 0);
|
||||
|
||||
this.outputMsg(player, "Set replicator source");
|
||||
} else {
|
||||
this.outputMsg(player, "This is not a Grid Tile.");
|
||||
}
|
||||
@@ -97,6 +121,7 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
|
||||
final int src_side = ish.getInt("side");
|
||||
final String worldId = ish.getString("w");
|
||||
final World src_w = world.getServer().getWorld(RegistryKey.of(Registry.DIMENSION, new Identifier(worldId)));
|
||||
final int replications = ish.getInt("r") + 1;
|
||||
|
||||
final BlockEntity te = src_w.getBlockEntity(new BlockPos(src_x, src_y, src_z));
|
||||
if (te instanceof IGridHost) {
|
||||
@@ -104,50 +129,73 @@ public class ReplicatorCardItem extends AEBaseItem implements AEToolItem {
|
||||
final Direction sideOff = Direction.values()[src_side];
|
||||
final Direction currentSideOff = side;
|
||||
final IGridNode n = gh.getGridNode(AEPartLocation.fromFacing(sideOff));
|
||||
|
||||
if (n != null) {
|
||||
final IGrid g = n.getGrid();
|
||||
|
||||
if (g != null) {
|
||||
final ISpatialCache sc = g.getCache(ISpatialCache.class);
|
||||
|
||||
if (sc.isValidRegion()) {
|
||||
final DimensionalCoord min = sc.getMin();
|
||||
final DimensionalCoord max = sc.getMax();
|
||||
|
||||
x += currentSideOff.getOffsetX();
|
||||
y += currentSideOff.getOffsetY();
|
||||
z += currentSideOff.getOffsetZ();
|
||||
// TODO: Why??? Places it one block up each time...
|
||||
// x += currentSideOff.getOffsetX();
|
||||
// y += currentSideOff.getOffsetY();
|
||||
// z += currentSideOff.getOffsetZ();
|
||||
|
||||
final int sc_size_x = max.x - min.x;
|
||||
final int sc_size_y = max.y - min.y;
|
||||
final int sc_size_z = max.z - min.z;
|
||||
|
||||
final int min_x = min.x;
|
||||
final int min_y = min.y;
|
||||
final int min_z = min.z;
|
||||
|
||||
final int rel_x = min.x - src_x + x;
|
||||
final int rel_y = min.y - src_y + y;
|
||||
final int rel_z = min.z - src_z + z;
|
||||
// Invert to maintain correct sign for west/east
|
||||
final int x_rot = (int) -Math.signum(MathHelper.wrapDegrees(player.rotationYaw));
|
||||
// Rotate by 90 degree, so north/south are negative/positive
|
||||
final int z_rot = (int) Math.signum(MathHelper.wrapDegrees(player.rotationYaw + 90));
|
||||
|
||||
final int scale_x = max.x - min.x;
|
||||
final int scale_y = max.y - min.y;
|
||||
final int scale_z = max.z - min.z;
|
||||
// Loops for replication in each direction
|
||||
for (int r_x = 0; r_x < replications; r_x++) {
|
||||
for (int r_y = 0; r_y < replications; r_y++) {
|
||||
for (int r_z = 0; r_z < replications; r_z++) {
|
||||
|
||||
for (int i = 1; i < scale_x; i++) {
|
||||
for (int j = 1; j < scale_y; j++) {
|
||||
for (int k = 1; k < scale_z; k++) {
|
||||
final BlockPos p = new BlockPos(min_x + i, min_y + j, min_z + k);
|
||||
final BlockPos d = new BlockPos(i + rel_x, j + rel_y, k + rel_z);
|
||||
final BlockState state = src_w.getBlockState(p);
|
||||
final Block blk = state.getBlock();
|
||||
final BlockState prev = world.getBlockState(d);
|
||||
// Offset x/z by the rotation index.
|
||||
// For sake of simplicity always grow upwards.
|
||||
final int rel_x = min.x - src_x + x + (r_x * sc_size_x * x_rot);
|
||||
final int rel_y = min.y - src_y + y + (r_y * sc_size_y);
|
||||
final int rel_z = min.z - src_z + z + (r_z * sc_size_z * z_rot);
|
||||
|
||||
world.setBlockState(d, state);
|
||||
if (blk instanceof BlockEntityProvider) {
|
||||
// Copy a single SC instance completely
|
||||
for (int i = 1; i < sc_size_x; i++) {
|
||||
for (int j = 1; j < sc_size_y; j++) {
|
||||
for (int k = 1; k < sc_size_z; k++) {
|
||||
final BlockPos p = new BlockPos(min_x + i, min_y + j,
|
||||
min_z + k);
|
||||
final BlockPos d = new BlockPos(i + rel_x, j + rel_y,
|
||||
k + rel_z);
|
||||
|
||||
final BlockState state = src_w.getBlockState(p);
|
||||
final Block blk = state.getBlock();
|
||||
final BlockState prev = world.getBlockState(d);
|
||||
|
||||
world.setBlockState(d, state);
|
||||
if (blk instanceof BlockEntityProvider) {
|
||||
BlockEntityProvider blkEntityProvider = (BlockEntityProvider)blk;
|
||||
final BlockEntity ote = src_w.getBlockEntity(p);
|
||||
final BlockEntity nte = blkEntityProvider.createBlockEntity(world);
|
||||
final CompoundTag data = new CompoundTag();
|
||||
ote.toTag(data);
|
||||
nte.fromTag(state, data.copy());
|
||||
world.setBlockEntity(d, nte);
|
||||
final BlockEntity ote = src_w.getBlockEntity(p);
|
||||
final BlockEntity nte = blkEntityProvider.createBlockEntity(world);
|
||||
final CompoundTag data = new CompoundTag();
|
||||
ote.toTag(data);
|
||||
nte.fromTag(state, data.copy());
|
||||
world.setBlockEntity(d, nte);
|
||||
}
|
||||
world.updateListeners(d, prev, state, 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
world.updateListeners(d, prev, state, 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user