mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-24 00:54:48 +00:00
Code Issues Releases Wiki Activity

Bump versions

Browse Source
This commit is contained in:
SquidDev
2019-04-24 11:53:17 +01:00
parent 26b73c2ff3
commit f15a278f3b
15 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
View File

@@ -8,8 +8,8 @@ package dan200.computercraft.client.render;
import dan200.computercraft.ComputerCraft;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.ModelBakeSettings;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.ModelRotationContainer;
import net.minecraft.client.render.model.UnbakedModel;
import net.minecraft.client.texture.Sprite;
import net.minecraft.util.Identifier;
@@ -81,7 +81,7 @@ public final class TurtleModelLoader
@Nullable
@Override
public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function<Identifier, Sprite> spriteGetter, @Nonnull ModelRotationContainer state )
public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function<Identifier, Sprite> spriteGetter, @Nonnull ModelBakeSettings state )
{
return new TurtleSmartItemModel(
loader.getOrLoadModel( family ).bake( loader, spriteGetter, state ),

2
src/main/java/dan200/computercraft/shared/Registry.java
View File

@@ -52,7 +52,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.block.BlockItem;
import net.minecraft.item.BlockItem;
import net.minecraft.recipe.RecipeSerializer;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.MutableRegistry;

2
src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
View File

@@ -54,7 +54,7 @@ public class TileCommandComputer extends TileComputer
}
@Override
public void appendCommandFeedback( TextComponent textComponent )
public void sendMessage( TextComponent textComponent )
{
output.put( output.size() + 1, textComponent.getText() );
}

2
src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
View File

@@ -13,8 +13,8 @@ import dan200.computercraft.api.media.IMedia;
import dan200.computercraft.shared.computer.blocks.BlockComputerBase;
import dan200.computercraft.shared.computer.core.ComputerFamily;
import net.minecraft.client.item.TooltipContext;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import net.minecraft.item.block.BlockItem;
import net.minecraft.text.StringTextComponent;
import net.minecraft.text.TextComponent;
import net.minecraft.text.TextFormat;

2
src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
View File

@@ -61,7 +61,7 @@ public class CommandBlockPeripheral implements IPeripheral
context.issueMainThreadTask( () ->
{
m_commandBlock.getCommandExecutor().setCommand( command );
m_commandBlock.getCommandExecutor().method_8295();
m_commandBlock.getCommandExecutor().markDirty();
return null;
} );
return null;

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

@@ -13,7 +13,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
import net.minecraft.item.block.BlockItem;
import net.minecraft.item.BlockItem;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundCategory;
import net.minecraft.util.ActionResult;

3
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
View File

@@ -22,9 +22,6 @@ import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.*;
import net.minecraft.item.block.BlockItem;
import net.minecraft.item.block.LilyPadItem;
import net.minecraft.item.block.SignItem;
import net.minecraft.text.StringTextComponent;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;

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

@@ -175,7 +175,7 @@ public final class TurtlePlayer extends FakePlayer
@Override
public void closeGui()
public void closeContainer()
{
}

2
src/main/java/dan200/computercraft/shared/util/WaterloggableBlock.java
View File

@@ -34,7 +34,7 @@ public interface WaterloggableBlock extends Waterloggable
*/
default FluidState getWaterloggedFluidState( BlockState state )
{
return state.get( WATERLOGGED ) ? Fluids.WATER.getState( false ) : Fluids.EMPTY.getDefaultState();
return state.get( WATERLOGGED ) ? Fluids.WATER.getStill( false ) : Fluids.EMPTY.getDefaultState();
}
/**