Skip to content

Commit

Permalink
Releasing initial version for Minecraft 1.20.3/4.
Browse files Browse the repository at this point in the history
* Requires Fabric Loader v0.15 or higher.
* No longer bundles MixinExtras.
* Remove StrippableLogBlock (deprecated since v6).
* Deprecate ComposterRecipes in favor of Fabric API.
  • Loading branch information
gniftygnome committed Dec 8, 2023
1 parent 0c98f3a commit 2b5cacf
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 101 deletions.
12 changes: 5 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ org.gradle.jvmargs=-Xmx2G
fabric.loom.multiProjectOptimisation=true

maven_group=com.terraformersmc.terraform-api
version=9.0.0-alpha.3
version=9.0.0-beta.1

minecraft_version=23w45a
yarn_mappings=23w45a+build.4
loader_version=0.14.24
fabric_version=0.90.8+1.20.3

mixinextras_version=0.2.0
minecraft_version=1.20.3
yarn_mappings=1.20.3+build.1
loader_version=0.15.1
fabric_version=0.91.1+1.20.3
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public final class DataVersions {
private DataVersions() {
return;
}

public static final int V_1_20_4 = 3699;
public static final int V_1_20_3 = 3692;
public static final int V_1_20_2 = 3572;
public static final int V_1_20_1 = 3464;
Expand Down
4 changes: 0 additions & 4 deletions terraform-dirt-api-v1/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
archivesBaseName = "terraform-dirt-api-v1"

dependencies {
include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
}
3 changes: 3 additions & 0 deletions terraform-dirt-api-v1/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
}
}
},
"depends": {
"fabricloader": ">=0.15"
},
"breaks": {
"moretags": "*"
},
Expand Down
2 changes: 0 additions & 2 deletions terraform-wood-api-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ dependencies {
testmodImplementation project(path: ":terraform-wood-api-v1", configuration: "namedElements")
modTestmodImplementation fabricApi.module("fabric-command-api-v2", project.fabric_version)
modTestmodImplementation fabricApi.module("fabric-item-group-api-v1", project.fabric_version)

include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
}
Original file line number Diff line number Diff line change
@@ -1,29 +1,57 @@
package com.terraformersmc.terraform.leaves;

import com.terraformersmc.terraform.leaves.block.ExtendedLeavesBlock;
import com.terraformersmc.terraform.leaves.block.LeafPileBlock;

import net.minecraft.block.Block;
import net.minecraft.block.ComposterBlock;
import net.minecraft.block.FernBlock;
import net.minecraft.block.FlowerBlock;
import net.minecraft.block.LeavesBlock;
import net.minecraft.block.SaplingBlock;
import net.minecraft.block.SeagrassBlock;
import net.minecraft.block.*;
import net.minecraft.item.ItemConvertible;
import net.minecraft.item.Items;

import java.util.Objects;

/**
* @deprecated This class is deprecated in favor of using Fabric's CompostingChanceRegistry.
*
* <p>For example:<br />
* <pre>{@code
* LeavesBlock leavesBlock = new LeavesBlock(...);
* BlockItem leavesItem = new BlockItem(leavesBlock, new Item.Settings());
* CompostingChanceRegistry.INSTANCE.add(leavesItem, chance);
* }</pre>
* </p>
*/
@Deprecated(since = "9.0.0", forRemoval = true)
public class ComposterRecipes {
/**
* @deprecated Use {@code CompostingChanceRegistry.INSTANCE.add(item, chance) } instead.
*
* @param item A compostable item
* @param chance The compostable item's composter fill chance
*/
@Deprecated
private static void registerCompostableItem(ItemConvertible item, float chance) {
if (item.asItem() != Items.AIR) {
ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(item.asItem(), chance);
}
}

/**
* @deprecated Use {@code CompostingChanceRegistry.INSTANCE.add(item, chance) } instead.
*
* <p><br />
* Blocks this method is capable of registering:
* <li>Fern and Large Fern</li>
* <li>Extenders of: FlowerBlock, LeafPileBlock, LeavesBlock, SaplingBlock, SeagrassBlock</li>
* </p>
*
* @param block A block with a compostable item
*/
@Deprecated
public static void registerCompostableBlock(Block block) {
if (block instanceof ExtendedLeavesBlock || block instanceof LeavesBlock || block instanceof LeafPileBlock || block instanceof SaplingBlock || block instanceof SeagrassBlock) {
Objects.requireNonNull(block);

if (block instanceof LeavesBlock || block instanceof LeafPileBlock || block instanceof SaplingBlock || block instanceof SeagrassBlock) {
registerCompostableItem(block, 0.3F);
} else if (block instanceof FernBlock || block instanceof FlowerBlock) {
} else if (block.equals(Blocks.FERN) || block.equals(Blocks.LARGE_FERN) || block instanceof FlowerBlock) {
registerCompostableItem(block, 0.65F);
}
}
Expand Down

This file was deleted.

3 changes: 3 additions & 0 deletions terraform-wood-api-v1/src/testmod/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@
"client": [
"com.terraformersmc.terraform.wood.test.TerraformWoodTestClient"
]
},
"depends": {
"fabricloader": ">=0.15"
}
}

0 comments on commit 2b5cacf

Please sign in to comment.