mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-23 23:46:55 +00:00
Code Issues Releases Wiki Activity

Bump to 1.14pr1

Browse Source
This commit is contained in:
SquidDev 2019-04-11 09:27:14 +01:00
parent c81bc70475
commit b1fff97bff
9 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
}
plugins {
id 'fabric-loom' version '0.2.0-SNAPSHOT'
id 'fabric-loom' version '0.2.1-SNAPSHOT'
id 'com.matthewprenger.cursegradle' version '1.2.0'
id "com.github.breadmoirai.github-release" version "2.2.4"
}
@ -52,9 +52,9 @@ configurations {
dependencies {
minecraft "com.mojang:minecraft:${mc_version}"
mappings "net.fabricmc:yarn:${mc_version}.${mappings_version}"
modCompile "net.fabricmc:fabric-loader:0.3.7.109"
modCompile "net.fabricmc:fabric:0.2.6.117"
mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}"
modCompile "net.fabricmc:fabric-loader:0.4.0+build.119"
modCompile "net.fabricmc:fabric:0.2.7+build.122"
// compileOnly "mezz.jei:jei-1.13.2:5.0.0.8:api"
// deobfProvided "pl.asie:Charset-Lib:0.5.4.6"

2
gradle.properties
View File

@ -2,5 +2,5 @@
mod_version=1.82.1
# Minecraft properties
mc_version=19w14a
mc_version=1.14 Pre-Release 1
mappings_version=3

9
src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java
View File

@ -39,6 +39,8 @@ public class WidgetTerminal implements Element
private final int termWidth;
private final int termHeight;
private boolean focused;
private float terminateTimer = -1;
private float rebootTimer = -1;
private float shutdownTimer = -1;
@ -293,9 +295,9 @@ public class WidgetTerminal implements Element
}
@Override
public void onFocusChanged( boolean noClue, boolean focused )
public boolean changeFocus( boolean reverse )
{
if( !focused )
if( focused )
{
// When blurring, we should make all keys go up
for( int key = 0; key < keysDown.size(); key++ )
@ -314,6 +316,9 @@ public class WidgetTerminal implements Element
shutdownTimer = terminateTimer = rebootTimer = -1;
}
focused = !focused;
return true;
}
public void draw( int originX, int originY )

4
src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java
View File

@ -33,9 +33,9 @@ public class WidgetWrapper implements Element
}
@Override
public void onFocusChanged( boolean a, boolean b )
public boolean changeFocus( boolean reverse )
{
listener.onFocusChanged( a, b );
return listener.changeFocus( reverse );
}
@Override

2
src/main/java/dan200/computercraft/shared/mixin/MixinItemFrameEntityRenderer.java
View File

@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin( ItemFrameEntityRenderer.class )
public class MixinItemFrameEntityRenderer
{
@Inject( method = "method_3992", at = @At( "HEAD" ), cancellable = true )
@Inject( method = "hasLabel", at = @At( "HEAD" ), cancellable = true ) // TODO: This name is entirely wrong
private void method_3992_Injected( ItemFrameEntity entity, CallbackInfo info )
{
ItemStack stack = entity.getHeldItemStack();

2
src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemBlockCable.java
View File

@ -43,7 +43,7 @@ public abstract class ItemBlockCable extends BlockItem
world.setBlockState( pos, state, 3 );
BlockSoundGroup soundType = state.getBlock().getSoundGroup( state );
world.playSound( null, pos, soundType.getPlaceSound(), SoundCategory.BLOCK, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F );
world.playSound( null, pos, soundType.getPlaceSound(), SoundCategory.BLOCKS, (soundType.getVolume() + 1.0F) / 2.0F, soundType.getPitch() * 0.8F );
BlockEntity tile = world.getBlockEntity( pos );
if( tile instanceof TileCable )

2
src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
View File

@ -146,7 +146,7 @@ public abstract class SpeakerPeripheral implements IPeripheral
float adjVolume = Math.min( volume, 3.0f );
server.getPlayerManager().sendToAround(
null, pos.x, pos.y, pos.z, adjVolume > 1.0f ? 16 * adjVolume : 16.0, world.getDimension().getType(),
new PlaySoundIdS2CPacket( name, SoundCategory.RECORD, pos, adjVolume, pitch )
new PlaySoundIdS2CPacket( name, SoundCategory.RECORDS, pos, adjVolume, pitch )
);
return null;
} );

6
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
View File

@ -17,6 +17,7 @@ import net.minecraft.command.arguments.EntityAnchorArgumentType;
import net.minecraft.container.Container;
import net.minecraft.entity.Entity;
import net.minecraft.entity.passive.HorseBaseEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
import net.minecraft.server.world.ServerWorld;
@ -139,12 +140,11 @@ public final class TurtlePlayer extends FakePlayer
return null;
}
@Nonnull
@Override
public Either<SleepResult, Void> trySleep( @Nonnull BlockPos bedLocation )
public Either<PlayerEntity.SleepFailureReason, Void> trySleep( @Nonnull BlockPos bedLocation )
{
return Either.left( SleepResult.INVALID_ATTEMPT );
return Either.left( PlayerEntity.SleepFailureReason.INVALID_ATTEMPT );
}
@Override

4
src/main/java/dan200/computercraft/shared/util/WorldUtil.java
View File

@ -29,7 +29,7 @@ import java.util.List;
public final class WorldUtil
{
@SuppressWarnings( "Guava" )
private static final Predicate<Entity> CAN_COLLIDE = x -> x != null && x.isAlive() && x.doesCollide();
private static final Predicate<Entity> CAN_COLLIDE = x -> x != null && x.isAlive() && x.collides();
public static boolean isLiquidBlock( World world, BlockPos pos )
{
@ -73,7 +73,7 @@ public final class WorldUtil
Entity closest = null;
double closestDist = 99.0;
List<Entity> list = world.getEntitiesInBox( Entity.class, bigBox, CAN_COLLIDE );
List<Entity> list = world.getEntities( Entity.class, bigBox, CAN_COLLIDE );
for( Entity entity : list )
{
BoundingBox littleBox = entity.getBoundingBox();