Skip to content

Commit

Permalink
1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
TropheusJ committed Apr 30, 2024
1 parent 3596fc6 commit f020a07
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ processResources {
properties.put("version", version)
properties.put("loader_version", loader_version)
properties.put("fabric_version", fabric_version)
properties.put("minecraft_version", minecraft_version)

properties.forEach((k, v) -> inputs.property(k, v))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,11 @@ public void remove(RemovalReason removalReason) {

@Nullable
@Override
public Entity changeDimension(ServerLevel serverLevel, boolean bl) {
public Entity changeDimension(ServerLevel serverLevel) {
if (this.merchant != null) {
this.merchant.setTradingPlayer(null);
}
return super.changeDimension(serverLevel, bl);
return super.changeDimension(serverLevel);
}

public void becomeChef(BlockPos workstation) {
Expand All @@ -155,7 +155,7 @@ public void becomeChef(BlockPos workstation) {
}

public void crushDreams() {
this.entityData.set(WORKSTATION,Optional.empty());
this.entityData.set(WORKSTATION, Optional.empty());
}

public boolean isChef() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ public class ShrimpMerchant implements Merchant {
public ShrimpMerchant(ShrimpEntity shrimp) {
this.shrimp = shrimp;
this.offers = new MerchantOffers();
this.offers.add(itemForGems(ItsAsShrimpleAsThat.FRIED_RICE, 2));
this.offers.add(itemForEmeralds(ItsAsShrimpleAsThat.FRIED_RICE, 2));
}

private MerchantOffer itemForGems(Item item, int count) {
private MerchantOffer itemForEmeralds(Item item, int count) {
return new MerchantOffer(
new ItemCost(Items.AMBER_GEM, count),
new ItemCost(Items.EMERALD, count),
new ItemStack(item),
Integer.MAX_VALUE, // max uses
1, // xp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Direction.Plane;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.FluidTags;
import net.minecraft.world.entity.PathfinderMob;
import net.minecraft.world.entity.ai.goal.MoveToBlockGoal;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Blocks;

public class FollowDreamsGoal extends MoveToBlockGoal {
private final ShrimpEntity shrimp;
Expand Down Expand Up @@ -55,7 +55,7 @@ protected boolean isValidTarget(LevelReader level, BlockPos pos) {
return false;
for (Direction direction : Plane.HORIZONTAL) {
BlockPos adjacent = pos.relative(direction);
if (level.getBlockState(adjacent).is(Blocks.FRYING_TABLE))
if (level.getBlockState(adjacent).is(BlockTags.CAMPFIRES))
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"depends": {
"fabricloader": ">=${loader_version}",
"fabric-api": ">=${fabric_version}",
"minecraft": "1.20.5-alpha.24.12.potato"
"minecraft": ">=${minecraft_version}"
}
}

0 comments on commit f020a07

Please sign in to comment.