Bump versions

2025-04-05 18:26:58 +00:00 · 2019-04-24 11:53:17 +01:00 · 2019-04-24 11:53:17 +01:00 · f15a278f3b
commit f15a278f3b
parent 26b73c2ff3
15 changed files with 52 additions and 24 deletions
--- a/build.gradle
+++ b/build.gradle
@ -7,7 +7,7 @@ buildscript {
 }

 plugins {
-    id 'fabric-loom' version '0.2.1-SNAPSHOT'
+    id 'fabric-loom' version '0.2.2-SNAPSHOT'
    id 'com.matthewprenger.cursegradle' version '1.2.0'
    id "com.github.breadmoirai.github-release" version "2.2.4"
 }
@ -53,8 +53,22 @@ configurations {
 dependencies {
    minecraft "com.mojang:minecraft:${mc_version}"
    mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}"
-    modCompile "net.fabricmc:fabric-loader:0.4.0+build.121"
-    modCompile "net.fabricmc:fabric:0.2.7+build.122"
+    modCompile "net.fabricmc:fabric-loader:0.4.2+build.132"
+    modCompile "net.fabricmc:fabric:0.2.7+build.126"
+
+    /*
+    modCompile "net.fabricmc:fabric-lib:0.1.0"
+    modCompile "net.fabricmc:fabric-networking:0.1.0"
+    modCompile "net.fabricmc:fabric-networking-blockentity:0.1.0"
+    modCompile "net.fabricmc:fabric-object-builders:0.1.0"
+    modCompile "net.fabricmc:fabric-containers:0.1.0"
+    modCompile "net.fabricmc:fabric-item-groups:0.1.0"
+    modCompile "net.fabricmc:fabric-client-registries:0.1.0"
+    modCompile "net.fabricmc:fabric-commands:0.1.0"
+    modCompile "net.fabricmc:fabric-events-lifecycle:0.1.0"
+    modCompile "net.fabricmc:fabric-events-interaction:0.1.0"
+    modCompile "net.fabricmc:fabric-resource-loader:0.1.0"
+    */

    implementation 'com.google.code.findbugs:jsr305:3.0.2'

@ -298,7 +312,7 @@ githubRelease {
    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
    owner 'SquidDev-CC'
    repo 'CC-Tweaked'
-    targetCommitish "mc-1.13.x" // TODO: Pull from GrGit
+    targetCommitish "mc-1.14-fabric" // TODO: Pull from GrGit

    tagName "v${mc_version}-${mod_version}"
    releaseName "[${mc_version}] ${mod_version}"
--- a/gradle.properties
+++ b/gradle.properties
@ -2,5 +2,5 @@
 mod_version=1.82.3

 # Minecraft properties
-mc_version=1.14 Pre-Release 2
+mc_version=1.14
 mappings_version=1
--- a/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
@ -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 ),
--- a/src/main/java/dan200/computercraft/shared/Registry.java
+++ b/src/main/java/dan200/computercraft/shared/Registry.java
@ -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;
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
@ -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() );
        }
--- a/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
@ -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;
--- a/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
@ -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;
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemBlockCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemBlockCable.java
@ -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;
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
@ -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;
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
@ -175,7 +175,7 @@ public final class TurtlePlayer extends FakePlayer


    @Override
-    public void closeGui()
+    public void closeContainer()
    {
    }

--- a/src/main/java/dan200/computercraft/shared/util/WaterloggableBlock.java
+++ b/src/main/java/dan200/computercraft/shared/util/WaterloggableBlock.java
@ -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();
    }

    /**
--- a/src/main/resources/assets/computercraft/pack.png
+++ b/src/main/resources/assets/computercraft/pack.png
--- a/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json
@ -7,7 +7,7 @@
        "has_redstone": {
            "trigger": "minecraft:inventory_changed",
            "conditions": {
-                "items": [ { "tag": "minecraft:redstone" } ]
+                "items": [ { "tag": "forge:dusts/redstone" } ]
            }
        },
        "has_the_recipe": {
--- a/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json
+++ b/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json
@ -7,7 +7,7 @@
        "has_redstone": {
            "trigger": "minecraft:inventory_changed",
            "conditions": {
-                "items": [ { "item": "minecraft:redstone" } ]
+                "items": [ { "tag": "forge:dusts/redstone" } ]
            }
        },
        "has_the_recipe": {
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@ -1,10 +1,27 @@
 {
+    "schemaVersion": 1,
+
    "id": "computercraft",
    "name": "CC: Tweaked",
    "version": "${version}",
-    "side": "universal",
-    "initializer": "dan200.computercraft.ComputerCraft",
-    "mixins": {
-        "client": "computercraft.client.json"
-    }
+    "description": "CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.",
+    "license": "ComputerCraft Public License",
+    "icon": "assets/computercraft/pack.png",
+    "contact": {
+        "homepage": "https://github.com/SquidDev-CC/CC-Tweaked",
+        "issues": "https://github.com/SquidDev-CC/CC-Tweaked/issues"
+    },
+    "authors": [
+        "Daniel Ratcliffe",
+        "Aaron Mills",
+        "SquidDev"
+    ],
+
+    "environment": "*",
+    "entrypoints": {
+        "main": [ "dan200.computercraft.ComputerCraft" ]
+    },
+    "mixins": [
+        { "config": "computercraft.client.json", "environment": "client" }
+    ]
 }