Skip to content

Commit

Permalink
Update to 1.14.4, deprecate CommonBlocks
Browse files Browse the repository at this point in the history
  • Loading branch information
falkreon committed Jul 22, 2019
1 parent a977580 commit eb7f6c1
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
id "fabric-loom" version "0.2.4-SNAPSHOT"
}

def minecraftVersion = "1.14.3"
def yarnMappings = "1.14.3+build.12"
def loaderVersion = "0.4.8+build.155"
def minecraftVersion = "1.14.4"
def yarnMappings = "1.14.4+build.2"
def loaderVersion = "0.4.8+build.157"

archivesBaseName = "cotton"
version = "1.0.0-rc.2"
Expand Down Expand Up @@ -46,7 +46,7 @@ dependencies {
compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false }

// For ModMenu compatibility tests
modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.187"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.200"
modImplementation "io.github.prospector.modmenu:ModMenu:1.6.3-94"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;

/** @deprecated The functionality from this class is moving to Cotton Resources */
@Deprecated
public class CommonBlocks {

/**Attempts to get a common block by name. If no block with this name was found register the given block and create a BlockItem for it.
* @param name The block name to look for. This is the path and does not include the namespace.
* @param block A block that will be registered if no block with this name was found.
* @return Returns either an already existing block with the specified name or a new one that was register under the given name.
* @deprecated This function is moving to Cotton Resources
*/
public static Block register(String name, Block block) {
BlockItem item = new BlockItem(block, new Item.Settings().group(CottonCommons.ITEM_GROUP));
Expand All @@ -27,6 +30,7 @@ public static Block register(String name, Block block) {
* @param block A block that will be registered if no block with this name was found.
* @param item The settings of the new Blocks BlockItem.
* @return Returns either an already existing block with the specified name or a new one that was register under the given name.
* @deprecated This function is moving to Cotton Resources
*/
public static Block register(String name, Block block, BlockItem item) {
Identifier id = new Identifier(CottonDatapack.SHARED_NAMESPACE, name);
Expand All @@ -46,6 +50,7 @@ public static Block register(String name, Block block, BlockItem item) {
*
* @param name The name to look for.
* @return Either the block if it is found or null if no such Common Block exists
* @deprecated This function is moving to Cotton Resources
*/
public static Block getBlock(String name){
Identifier id = new Identifier(CottonDatapack.SHARED_NAMESPACE, name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ public class CottonCommons implements ModInitializer {

public static final String MODID = "cotton-commons";

/**
* @deprecated The "Common Items" group, and all registration logic for it, is moving to the "Cotton Resources" mod.
*/
@Deprecated
public static final ItemGroup ITEM_GROUP = FabricItemGroupBuilder.build(
new Identifier("cotton-commons", "common_item_group"), () -> new ItemStack(Blocks.LIGHT_BLUE_WOOL));

Expand Down
6 changes: 3 additions & 3 deletions modules/module-base.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def minecraftVersion = "1.14.3"
def yarnMappings = "1.14.3+build.12"
def loaderVersion = "0.4.8+build.155"
def minecraftVersion = "1.14.4"
def yarnMappings = "1.14.4+build.2"
def loaderVersion = "0.4.8+build.157"

//Publishing details
if (rootProject.file("../../private.gradle").exists()) {
Expand Down

0 comments on commit eb7f6c1

Please sign in to comment.