Skip to content

Commit

Permalink
Update to 24w10a (#90)
Browse files Browse the repository at this point in the history
* Remove unused mixin
* Update to 24w10a
* Update sparse stuff
  • Loading branch information
Hugman76 authored Mar 15, 2024
1 parent 4ebd3be commit 4d1431a
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 63 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true

maven_group=com.terraformersmc.terraform-api
version=10.0.0-alpha.6
version=10.0.0-alpha.7

minecraft_version=24w07a
yarn_mappings=24w07a+build.4
minecraft_version=24w10a
yarn_mappings=24w10a+build.7
loader_version=0.15.7
fabric_version=0.96.3+1.20.5
fabric_version=0.96.8+1.20.5
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* {@link TerraformDirtRegistry}.
*/
public abstract class TillableBlockRegistry extends HoeItem {
private TillableBlockRegistry(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
super(material, attackDamage, attackSpeed, settings);
private TillableBlockRegistry(ToolMaterial material, Settings settings) {
super(material, settings);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.minecraft.util.math.random.Random;
import net.minecraft.village.TradeOffer;
import net.minecraft.village.TradeOffers;
import net.minecraft.village.TradedItem;

/**
* A helper class for merchant trades regarding saplings.
Expand Down Expand Up @@ -35,7 +36,7 @@ public SellSaplingFactory(ItemConvertible sapling) {

@Override
public TradeOffer create(Entity entity, Random random) {
return new TradeOffer(new ItemStack(Items.EMERALD, 5), this.sapling, 8, 1, 0.05f);
return new TradeOffer(new TradedItem(Items.EMERALD, 5), this.sapling, 8, 1, 0.05f);
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public BlockState mirror(BlockState state, BlockMirror mirror) {
}

@Override
public boolean canPathfindThrough(BlockState state, BlockView view, BlockPos pos, NavigationType blockPlacementEnvironment_1) {
public boolean canPathfindThrough(BlockState state, NavigationType type) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"MixinHangingSignBlockEntityRenderer",
"MixinHangingSignEditScreen",
"MixinSignBlockEntityRenderer",
"MixinSignEditScreen",
"MixinTexturedRenderLayers"
"MixinSignEditScreen"
],
"mixins": [
"MixinAbstractBlockSettings",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
package com.terraformersmc.terraform.wood.test;

import com.terraformersmc.terraform.boat.api.client.TerraformBoatClientHelper;
import com.terraformersmc.terraform.sign.SpriteIdentifierRegistry;

import net.fabricmc.api.ClientModInitializer;
import net.minecraft.client.render.TexturedRenderLayers;
import net.minecraft.client.util.SpriteIdentifier;

public class TerraformWoodTestClient implements ClientModInitializer {
@Override
public void onInitializeClient() {
TerraformBoatClientHelper.registerModelLayers(TerraformWoodTest.CUSTOM_BOAT_ID, false);
TerraformBoatClientHelper.registerModelLayers(TerraformWoodTest.CUSTOM_RAFT_ID, true);

SpriteIdentifierRegistry.INSTANCE.addIdentifier(new SpriteIdentifier(TexturedRenderLayers.SIGNS_ATLAS_TEXTURE, TerraformWoodTest.SIGN_TEXTURE_ID));
SpriteIdentifierRegistry.INSTANCE.addIdentifier(new SpriteIdentifier(TexturedRenderLayers.SIGNS_ATLAS_TEXTURE, TerraformWoodTest.HANGING_SIGN_TEXTURE_ID));
}
}

0 comments on commit 4d1431a

Please sign in to comment.