Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-19 15:09:15 +00:00
Code Issues Releases Activity

bump versions

Browse Source
This commit is contained in:
XiaoMoMi
2025-03-18 23:37:34 +08:00
parent 3ab223654d
commit 5fb238f090
18 changed files with 86 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit-loader/build.gradle.kts
View File

@@ -1,5 +1,5 @@
plugins {
id("com.gradleup.shadow") version "9.0.0-beta6"
id("com.gradleup.shadow") version "9.0.0-beta11"
id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
}

2
bukkit/build.gradle.kts
View File

@@ -1,5 +1,5 @@
plugins {
id("com.gradleup.shadow") version "9.0.0-beta6"
id("com.gradleup.shadow") version "9.0.0-beta11"
id("maven-publish")
}

2
bukkit/legacy/build.gradle.kts
View File

@@ -1,5 +1,5 @@
plugins {
id("io.github.goooler.shadow") version "8.1.8"
id("com.gradleup.shadow") version "9.0.0-beta11"
}
repositories {

4
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/furniture/BukkitFurnitureManager.java
View File

@@ -343,9 +343,7 @@ public class BukkitFurnitureManager implements FurnitureManager {
return;
}
Vector3f seatPos = MiscUtils.getVector3f(vector3f);
if (!furniture.releaseSeat(seatPos)) {
plugin.logger().warn("Failed to release seat " + seatPos + " for player " + player.getName());
}
furniture.releaseSeat(seatPos);
}
protected boolean isSeatCarrierType(Entity entity) {

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/AxeItemBehavior.java
View File

@@ -88,7 +88,7 @@ public class AxeItemBehavior extends ItemBehavior {
if (!InteractUtils.isInteractable(BlockStateUtils.getBlockOwnerIdFromState(state.vanillaBlockState().handle()),
bukkitPlayer, BlockStateUtils.fromBlockData(state.vanillaBlockState().handle()),
context.getHitResult(), item
)) {
) || player.isSecondaryUseActive()) {
player.swingHand(context.getHand());
}
// shrink item amount

3
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java
View File

@@ -54,6 +54,9 @@ public class BukkitRecipeManager implements RecipeManager<ItemStack> {
private static BukkitRecipeManager instance;
static {
BUKKIT_RECIPE_FACTORIES.put(RecipeTypes.SMITHING_TRANSFORM, (key, recipe) -> {
});
BUKKIT_RECIPE_FACTORIES.put(RecipeTypes.SHAPED, (key, recipe) -> {
CustomShapedRecipe<ItemStack> ceRecipe = (CustomShapedRecipe<ItemStack>) recipe;
ShapedRecipe shapedRecipe = new ShapedRecipe(key, ceRecipe.result(ItemBuildContext.EMPTY));

7
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/RecipeEventListener.java
View File

@@ -832,4 +832,11 @@ public class RecipeEventListener implements Listener {
plugin.logger().warn("Failed to correct used recipe", e);
}
}
@EventHandler(ignoreCancelled = true)
public void onSmithingTransform(PrepareSmithingEvent event) {
SmithingInventory inventory = event.getInventory();
if (!(inventory.getRecipe() instanceof SmithingTransformRecipe recipe)) return;
}
}

2
core/build.gradle.kts
View File

@@ -1,5 +1,5 @@
plugins {
id("com.gradleup.shadow") version "9.0.0-beta6"
id("com.gradleup.shadow") version "9.0.0-beta11"
id("maven-publish")
}

5
core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractRecipe.java → core/src/main/java/net/momirealms/craftengine/core/item/recipe/AbstractGroupedRecipe.java
View File

@@ -4,18 +4,17 @@ import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.util.Key;
import org.jetbrains.annotations.Nullable;
public abstract class AbstractRecipe<T> implements Recipe<T> {
public abstract class AbstractGroupedRecipe<T> implements Recipe<T> {
protected final String group;
protected final Key id;
protected final CustomRecipeResult<T> result;
protected AbstractRecipe(Key id, String group, CustomRecipeResult<T> result) {
protected AbstractGroupedRecipe(Key id, String group, CustomRecipeResult<T> result) {
this.group = group;
this.id = id;
this.result = result;
}
@Override
@Nullable
public String group() {
return group;

2
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCookingRecipe.java
View File

@@ -6,7 +6,7 @@ import net.momirealms.craftengine.core.util.Key;
import java.util.List;
public abstract class CustomCookingRecipe<T> extends AbstractRecipe<T> {
public abstract class CustomCookingRecipe<T> extends AbstractGroupedRecipe<T> {
protected final CookingRecipeCategory category;
protected final Ingredient<T> ingredient;
protected final float experience;

2
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomCraftingTableRecipe.java
View File

@@ -2,7 +2,7 @@ package net.momirealms.craftengine.core.item.recipe;
import net.momirealms.craftengine.core.util.Key;
public abstract class CustomCraftingTableRecipe<T> extends AbstractRecipe<T> {
public abstract class CustomCraftingTableRecipe<T> extends AbstractGroupedRecipe<T> {
protected final CraftingRecipeCategory category;
protected CustomCraftingTableRecipe(Key id, CraftingRecipeCategory category, String group, CustomRecipeResult<T> result) {

57
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomSmithingTransformRecipe.java
View File

@@ -1,4 +1,59 @@
package net.momirealms.craftengine.core.item.recipe;
public class CustomSmithingTransformRecipe {
import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.item.recipe.input.RecipeInput;
import net.momirealms.craftengine.core.util.Key;
import org.jetbrains.annotations.NotNull;
import java.util.List;
public class CustomSmithingTransformRecipe<T> implements Recipe<T> {
private final Key id;
private final CustomRecipeResult<T> result;
private final Ingredient<T> template;
private final Ingredient<T> base;
private final Ingredient<T> addition;
public CustomSmithingTransformRecipe(Key id,
CustomRecipeResult<T> result,
Ingredient<T> template,
Ingredient<T> base,
Ingredient<T> addition
) {
this.id = id;
this.result = result;
this.template = template;
this.base = base;
this.addition = addition;
}
@Override
public boolean matches(RecipeInput input) {
return false;
}
@Override
public List<Ingredient<T>> ingredientsInUse() {
return List.of();
}
@Override
public @NotNull Key type() {
return RecipeTypes.SMITHING_TRANSFORM;
}
@Override
public Key id() {
return id;
}
@Override
public T result(ItemBuildContext context) {
return result.buildItemStack(context);
}
@Override
public CustomRecipeResult<T> result() {
return this.result;
}
}

2
core/src/main/java/net/momirealms/craftengine/core/item/recipe/CustomStoneCuttingRecipe.java
View File

@@ -14,7 +14,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
public class CustomStoneCuttingRecipe<T> extends AbstractRecipe<T> {
public class CustomStoneCuttingRecipe<T> extends AbstractGroupedRecipe<T> {
public static final Factory<?> FACTORY = new Factory<>();
protected final Ingredient<T> ingredient;

4
core/src/main/java/net/momirealms/craftengine/core/item/recipe/Recipe.java
View File

@@ -4,7 +4,6 @@ import net.momirealms.craftengine.core.item.ItemBuildContext;
import net.momirealms.craftengine.core.item.recipe.input.RecipeInput;
import net.momirealms.craftengine.core.util.Key;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -22,7 +21,4 @@ public interface Recipe<T> {
Key type();
Key id();
@Nullable
String group();
}

4
gradle.properties
View File

@@ -1,6 +1,6 @@
# Project settings
# Rule: [major update].[feature update].[bug fix]
project_version=0.0.34
project_version=0.0.35
config_version=14
lang_version=3
project_group=net.momirealms
@@ -38,7 +38,7 @@ geantyref_version=1.3.16
zstd_version=1.5.6-9
commons_io_version=2.17.0
sparrow_nbt_version=0.3
sparrow_util_version=0.23
sparrow_util_version=0.27
fastutil_version=8.5.15
netty_version=4.1.119.Final
joml_version=1.10.8

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

4
server-mod/build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins {
id("java-library")
id("com.gradleup.shadow") version "9.0.0-beta6"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.14"
id("com.gradleup.shadow") version "9.0.0-beta11"
id("io.papermc.paperweight.userdev") version "2.0.0-beta.16"
}
repositories {

4
settings.gradle.kts
View File

@@ -9,5 +9,9 @@ pluginManagement {
plugins {
kotlin("jvm") version "2.0.20"
}
repositories {
gradlePluginPortal()
maven("https://repo.papermc.io/repository/maven-public/")
}
}