From f15a278f3b68f1d22d8d99aa3ef8752505fed86c Mon Sep 17 00:00:00 2001 From: SquidDev Date: Wed, 24 Apr 2019 11:53:17 +0100 Subject: [PATCH] Bump versions --- build.gradle | 22 +++++++++++--- gradle.properties | 2 +- .../client/render/TurtleModelLoader.java | 4 +-- .../dan200/computercraft/shared/Registry.java | 2 +- .../computer/blocks/TileCommandComputer.java | 2 +- .../computer/items/ItemComputerBase.java | 2 +- .../commandblock/CommandBlockPeripheral.java | 2 +- .../modem/wired/ItemBlockCable.java | 2 +- .../turtle/core/TurtlePlaceCommand.java | 3 -- .../shared/turtle/core/TurtlePlayer.java | 2 +- .../shared/util/WaterloggableBlock.java | 2 +- .../resources/assets/computercraft/pack.png | Bin 0 -> 516 bytes .../recipes/advanced_computer.json | 2 +- .../advancements/recipes/normal_computer.json | 2 +- src/main/resources/fabric.mod.json | 27 ++++++++++++++---- 15 files changed, 52 insertions(+), 24 deletions(-) create mode 100644 src/main/resources/assets/computercraft/pack.png diff --git a/build.gradle b/build.gradle index 84747a060..a25677ebd 100644 --- 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}" diff --git a/gradle.properties b/gradle.properties index edd19410a..2aca66a6a 100644 --- 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 diff --git a/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java b/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java index 1e784acf9..2df24ae1b 100644 --- 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 spriteGetter, @Nonnull ModelRotationContainer state ) + public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function spriteGetter, @Nonnull ModelBakeSettings state ) { return new TurtleSmartItemModel( loader.getOrLoadModel( family ).bake( loader, spriteGetter, state ), diff --git a/src/main/java/dan200/computercraft/shared/Registry.java b/src/main/java/dan200/computercraft/shared/Registry.java index 91fe6d840..ac487bf43 100644 --- 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; diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java index 3a8688784..e0c3c333e 100644 --- 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() ); } diff --git a/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java b/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java index 30479a89f..155afb352 100644 --- 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; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java index c7980dfdc..1b5f2a379 100644 --- 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; diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemBlockCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/ItemBlockCable.java index 9275068e7..0639f0e72 100644 --- 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; diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java index bd21468b0..282a4f363 100644 --- 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; diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java index 1340d18e4..d57373b78 100644 --- 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() { } diff --git a/src/main/java/dan200/computercraft/shared/util/WaterloggableBlock.java b/src/main/java/dan200/computercraft/shared/util/WaterloggableBlock.java index 796b7195f..0a82d3d93 100644 --- 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(); } /** diff --git a/src/main/resources/assets/computercraft/pack.png b/src/main/resources/assets/computercraft/pack.png new file mode 100644 index 0000000000000000000000000000000000000000..3e461166350a8a3ca3c50ab262314eaa4d071727 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h7I;J!GcfQS24TkI`72U@f|4b!5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66 zdWM!)u5AJ-Y6SJ%|k)YaA1*Vi{NFfcMQGB!3gH8nLeGqbR; zu(GnUwzjsnxA*e$^7i)j_4RFTZeFuy&HDB0H*Vaxb?esCM+(oLDn56#<=n}Vb7!m0 zoo_sUto{7)=JO{T&z~wkf2#5P>BjSC%Fmx^Jb$+J!pXV|r)w^pZn$v1;s5{tS>_YE zfbMzX>Eaj?aro)A>s*HnB-$QYy}nod{_5}j_V@jTI2I+@{HgWp%KXHocuS4<${ekr zDS<_wG7g@<9Kl!`GC_iKjlp3lYZ>NWdk)HlKkwmQ!_sA;*lE&gcE`zq{V^MF+7GjW zhJ7H;N%kbA=ojs2iVIl1ZS>F0DQ{%eVNK!-*wJYj!SO=zlXps=+8UN$CzN~_w6AM* z5O+S3v!H)VqN;(Dk3!F%;shS=#)s_5&#&6e(^Zn-=fvpPtLy zC>N*u;g9Y9nGg3ISCis+(ZBK0lKhNEpJ&7;D-^I-cHCHa;8Ox9z8O4S{an^LB{Ts5 DHd509 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json b/src/main/resources/data/computercraft/advancements/recipes/advanced_computer.json index b4e814730..fa3783c51 100644 --- 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": { diff --git a/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json b/src/main/resources/data/computercraft/advancements/recipes/normal_computer.json index b8ef77055..1ad34028d 100644 --- 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": { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fb9e39d29..995f52060 100644 --- 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" } + ] }