mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2024-06-28 08:03:21 +00:00
f9e13ca67a
Look, I originally had this split into several commits, but lots of other cleanups got mixed in. I then backported some of the cleanups to 1.12, did other tidy ups there, and eventually the web of merges was unreadable. Yes, this is a horrible mess, but it's still nicer than it was. Anyway, changes: - Flatten everything. For instance, there are now three instances of BlockComputer, two BlockTurtle, ItemPocketComputer. There's also no more BlockPeripheral (thank heavens) - there's separate block classes for each peripheral type. - Remove pretty much all legacy code. As we're breaking world compatibility anyway, we can remove all the code to load worlds from 1.4 days. - The command system is largely rewriten to take advantage of 1.13's new system. It's very fancy! - WidgetTerminal now uses Minecraft's "GUI listener" system. - BREAKING CHANGE: All the codes in keys.lua are different, due to the move to LWJGL 3. Hopefully this won't have too much of an impact. I don't want to map to the old key codes on the Java side, as there always ends up being small but slight inconsistencies. IMO it's better to make a clean break - people should be using keys rather than hard coding the constants anyway. - commands.list now allows fetching sub-commands. The ROM has already been updated to allow fancy usage such as commands.time.set("noon"). - Turtles, modems and cables can be waterlogged.
137 lines
4.6 KiB
Java
137 lines
4.6 KiB
Java
/*
|
|
* This file is part of ComputerCraft - http://www.computercraft.info
|
|
* Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
|
|
* Send enquiries to dratcliffe@gmail.com
|
|
*/
|
|
|
|
package dan200.computercraft.shared.util;
|
|
|
|
import dan200.computercraft.ComputerCraft;
|
|
import net.minecraft.entity.Entity;
|
|
import net.minecraft.entity.item.EntityItem;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.util.math.AxisAlignedBB;
|
|
import net.minecraft.util.math.BlockPos;
|
|
import net.minecraft.world.World;
|
|
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
|
|
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
|
import net.minecraftforge.event.world.BlockEvent;
|
|
import net.minecraftforge.eventbus.api.EventPriority;
|
|
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|
import net.minecraftforge.fml.common.Mod;
|
|
|
|
import java.lang.ref.WeakReference;
|
|
import java.util.ArrayList;
|
|
import java.util.Collection;
|
|
import java.util.List;
|
|
import java.util.function.Function;
|
|
|
|
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
|
|
public final class DropConsumer
|
|
{
|
|
private DropConsumer()
|
|
{
|
|
}
|
|
|
|
private static Function<ItemStack, ItemStack> dropConsumer;
|
|
private static List<ItemStack> remainingDrops;
|
|
private static WeakReference<World> dropWorld;
|
|
private static BlockPos dropPos;
|
|
private static AxisAlignedBB dropBounds;
|
|
private static WeakReference<Entity> dropEntity;
|
|
|
|
public static void set( Entity entity, Function<ItemStack, ItemStack> consumer )
|
|
{
|
|
dropConsumer = consumer;
|
|
remainingDrops = new ArrayList<>();
|
|
dropEntity = new WeakReference<>( entity );
|
|
dropWorld = new WeakReference<>( entity.world );
|
|
dropPos = null;
|
|
dropBounds = new AxisAlignedBB( entity.getPosition() ).grow( 2, 2, 2 );
|
|
|
|
entity.captureDrops( new ArrayList<>() );
|
|
}
|
|
|
|
public static void set( World world, BlockPos pos, Function<ItemStack, ItemStack> consumer )
|
|
{
|
|
dropConsumer = consumer;
|
|
remainingDrops = new ArrayList<>();
|
|
dropEntity = null;
|
|
dropWorld = new WeakReference<>( world );
|
|
dropPos = pos;
|
|
dropBounds = new AxisAlignedBB( pos ).grow( 2, 2, 2 );
|
|
}
|
|
|
|
public static List<ItemStack> clear()
|
|
{
|
|
if( dropEntity != null )
|
|
{
|
|
Entity entity = dropEntity.get();
|
|
if( entity != null )
|
|
{
|
|
Collection<EntityItem> dropped = entity.captureDrops( null );
|
|
if( dropped != null )
|
|
{
|
|
for( EntityItem entityItem : dropped ) handleDrops( entityItem.getItem() );
|
|
}
|
|
}
|
|
}
|
|
|
|
List<ItemStack> remainingStacks = remainingDrops;
|
|
|
|
dropConsumer = null;
|
|
remainingDrops = null;
|
|
dropEntity = null;
|
|
dropWorld = null;
|
|
dropPos = null;
|
|
dropBounds = null;
|
|
|
|
return remainingStacks;
|
|
}
|
|
|
|
private static void handleDrops( ItemStack stack )
|
|
{
|
|
ItemStack remaining = dropConsumer.apply( stack );
|
|
if( !remaining.isEmpty() ) remainingDrops.add( remaining );
|
|
}
|
|
|
|
@SubscribeEvent( priority = EventPriority.LOWEST )
|
|
public static void onEntityLivingDrops( LivingDropsEvent event )
|
|
{
|
|
// Capture any mob drops for the current entity
|
|
if( dropEntity != null && event.getEntity() == dropEntity.get() )
|
|
{
|
|
Collection<EntityItem> drops = event.getDrops();
|
|
for( EntityItem entityItem : drops ) handleDrops( entityItem.getItem() );
|
|
drops.clear();
|
|
}
|
|
}
|
|
|
|
@SubscribeEvent( priority = EventPriority.LOWEST )
|
|
public static void onHarvestDrops( BlockEvent.HarvestDropsEvent event )
|
|
{
|
|
// Capture block drops for the current entity
|
|
if( dropWorld != null && dropWorld.get() == event.getWorld()
|
|
&& dropPos != null && dropPos.equals( event.getPos() ) )
|
|
{
|
|
for( ItemStack item : event.getDrops() )
|
|
{
|
|
if( event.getWorld().getRandom().nextFloat() < event.getDropChance() ) handleDrops( item );
|
|
}
|
|
event.getDrops().clear();
|
|
}
|
|
}
|
|
|
|
@SubscribeEvent( priority = EventPriority.LOWEST )
|
|
public static void onEntitySpawn( EntityJoinWorldEvent event )
|
|
{
|
|
// Capture any nearby item spawns
|
|
if( dropWorld != null && dropWorld.get() == event.getWorld() && event.getEntity() instanceof EntityItem
|
|
&& dropBounds.contains( event.getEntity().getPositionVector() ) )
|
|
{
|
|
handleDrops( ((EntityItem) event.getEntity()).getItem() );
|
|
event.setCanceled( true );
|
|
}
|
|
}
|
|
}
|