mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-31 21:52:59 +00:00
Code Issues Releases Wiki Activity

Started work on upgrading to 1.16.1. Not in a compilable state yet

Browse Source
This commit is contained in:
Alex Evelyn
2020-07-07 13:27:13 -04:00
parent cb66ef7e30
commit 605e1f6b9b
513 changed files with 48117 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java
View File

@@ -11,8 +11,7 @@ import dan200.computercraft.api.turtle.TurtleUpgradeType;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.SystemUtil;
import net.minecraft.util.Util;
import javax.annotation.Nonnull;
/**
@@ -42,7 +41,7 @@ public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemStack stack )
{
this( id, type, SystemUtil.createTranslationKey( "upgrade", id ) + ".adjective", stack );
this( id, type, Util.createTranslationKey( "upgrade", id ) + ".adjective", stack );
}
protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemConvertible item )

5
src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java
View File

@@ -9,8 +9,7 @@ package dan200.computercraft.api.pocket;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.SystemUtil;
import net.minecraft.util.Util;
import javax.annotation.Nonnull;
/**
@@ -38,7 +37,7 @@ public abstract class AbstractPocketUpgrade implements IPocketUpgrade
protected AbstractPocketUpgrade( Identifier id, ItemConvertible item )
{
this( id, SystemUtil.createTranslationKey( "upgrade", id ) + ".adjective", new ItemStack( item ) );
this( id, Util.createTranslationKey( "upgrade", id ) + ".adjective", new ItemStack( item ) );
}
@Nonnull

48
src/main/java/dan200/computercraft/api/turtle/event/FakePlayer.java
View File

@@ -13,8 +13,6 @@ import io.netty.util.concurrent.GenericFutureListener;
import net.minecraft.block.entity.CommandBlockBlockEntity;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.command.arguments.EntityAnchorArgumentType;
import net.minecraft.container.Container;
import net.minecraft.container.NameableContainerProvider;
import net.minecraft.entity.Entity;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.effect.StatusEffectInstance;
@@ -26,18 +24,20 @@ import net.minecraft.network.MessageType;
import net.minecraft.network.NetworkSide;
import net.minecraft.network.NetworkState;
import net.minecraft.network.Packet;
import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
import net.minecraft.recipe.Recipe;
import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerInteractionManager;
import net.minecraft.server.network.packet.RequestCommandCompletionsC2SPacket;
import net.minecraft.server.network.packet.VehicleMoveC2SPacket;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvent;
import net.minecraft.text.Text;
import net.minecraft.util.DefaultedList;
import net.minecraft.util.Hand;
import net.minecraft.util.collection.DefaultedList;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.village.TraderOfferList;
@@ -65,16 +65,16 @@ public class FakePlayer extends ServerPlayerEntity
// region Direct networkHandler access
@Override
public void method_6000() { }
public void enterCombat() { }
@Override
public void method_6044() { }
public void endCombat() { }
@Override
public void tick() { }
@Override
public void method_14226() { }
public void playerTick() { }
@Override
public void onDeath( DamageSource damage ) { }
@@ -102,7 +102,7 @@ public class FakePlayer extends ServerPlayerEntity
public void openEditSignScreen( SignBlockEntity tile ) { }
@Override
public OptionalInt openContainer( @Nullable NameableContainerProvider container )
public OptionalInt openHandledScreen( @Nullable NamedScreenHandlerFactory container )
{
return OptionalInt.empty();
}
@@ -120,25 +120,25 @@ public class FakePlayer extends ServerPlayerEntity
public void openCommandBlockScreen( CommandBlockBlockEntity block ) { }
@Override
public void onContainerSlotUpdate( Container container, int slot, ItemStack stack ) { }
public void onSlotUpdate( ScreenHandler container, int slot, ItemStack stack ) { }
@Override
public void onContainerRegistered( Container container, DefaultedList<ItemStack> defaultedList ) { }
public void onHandlerRegistered( ScreenHandler container, DefaultedList<ItemStack> defaultedList ) { }
@Override
public void onContainerPropertyUpdate( Container container, int key, int value ) { }
public void onPropertyUpdate( ScreenHandler container, int key, int value ) { }
@Override
public void closeContainer() { }
public void closeHandledScreen() { }
@Override
public void method_14241() { }
public void updateCursorStack() { }
@Override
public void addChatMessage( Text textComponent, boolean status ) { }
public void sendMessage( Text textComponent, boolean status ) { }
@Override
protected void method_6040() { }
protected void consumeItem() { }
@Override
public void lookAt( EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d ) { }
@@ -147,13 +147,13 @@ public class FakePlayer extends ServerPlayerEntity
public void method_14222( EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target ) { }
@Override
protected void method_6020( StatusEffectInstance statusEffectInstance ) { }
protected void onStatusEffectApplied( StatusEffectInstance statusEffectInstance ) { }
@Override
protected void method_6009( StatusEffectInstance statusEffectInstance, boolean particles ) { }
protected void onStatusEffectUpgraded( StatusEffectInstance statusEffectInstance, boolean particles ) { }
@Override
protected void method_6129( StatusEffectInstance statusEffectInstance ) { }
protected void onStatusEffectRemoved( StatusEffectInstance statusEffectInstance ) { }
@Override
public void requestTeleport( double x, double y, double z ) { }
@@ -162,16 +162,16 @@ public class FakePlayer extends ServerPlayerEntity
public void setGameMode( GameMode gameMode ) { }
@Override
public void sendChatMessage( Text textComponent, MessageType chatMessageType ) { }
public void sendMessage( Text textComponent, MessageType chatMessageType ) { }
@Override
public String getServerBrand()
public String getIp()
{
return "[Fake Player]";
}
@Override
public void method_14255( String url, String hash ) { }
public void sendResourcePackUrl( String url, String hash ) { }
@Override
public void onStoppedTracking( Entity entity ) { }
@@ -254,7 +254,7 @@ public class FakePlayer extends ServerPlayerEntity
}
@Override
protected void method_10770( ChannelHandlerContext context, Packet<?> packet )
protected void channelRead0( ChannelHandlerContext context, Packet<?> packet )
{
}
@@ -274,7 +274,7 @@ public class FakePlayer extends ServerPlayerEntity
}
@Override
public void setMinCompressedSize( int size )
public void setCompressionThreshold( int size )
{
}