oier/trading-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CraftTweaker support

Browse Source
This commit is contained in:
Oier Bravo
2023-08-30 19:10:58 +02:00
parent caf51f25a8
commit 50e0b5e774
13 changed files with 135 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/oierbravo/trading_station/compat/crafttweaker/MeltingRecipeHandler.java.wip → src/main/java/com/oierbravo/trading_station/compat/crafttweaker/TradingRecipeHandler.java
View File

@@ -14,7 +14,7 @@ public class TradingRecipeHandler implements IRecipeHandler<TradingRecipe>{
@Override
public String dumpToCommandString(IRecipeManager<? super TradingRecipe> manager, TradingRecipe recipe) {
return manager.getCommandString() + recipe.toString() + recipe.getOutput() + "[" + recipe.getIngredient() + "]";
return manager.getCommandString() + recipe.toString() + recipe.getResultItem() + "[" + recipe.getIngredients() + "]";
}
@Override
public <U extends Recipe<?>> boolean doesConflict(IRecipeManager<? super TradingRecipe> manager, TradingRecipe firstRecipe, U secondRecipe) {

28
src/main/java/com/oierbravo/trading_station/compat/crafttweaker/MeltingRecipeManager.java.wip → src/main/java/com/oierbravo/trading_station/compat/crafttweaker/TradingRecipeManager.java
View File

@@ -6,13 +6,23 @@ import com.blamejared.crafttweaker.api.action.recipe.ActionAddRecipe;
import com.blamejared.crafttweaker.api.annotation.ZenRegister;
import com.blamejared.crafttweaker.api.fluid.IFluidStack;
import com.blamejared.crafttweaker.api.ingredient.IIngredient;
import com.blamejared.crafttweaker.api.item.IItemStack;
import com.blamejared.crafttweaker.api.recipe.manager.base.IRecipeManager;
import com.oierbravo.trading_station.TradingStation;
import com.oierbravo.trading_station.content.trading_recipe.BiomeCondition;
import com.oierbravo.trading_station.content.trading_recipe.ExclusiveToCondition;
import com.oierbravo.trading_station.content.trading_recipe.TradingRecipe;
import com.oierbravo.trading_station.content.trading_recipe.TradingRecipeBuilder;
import net.minecraft.core.NonNullList;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.RecipeType;
import org.openzen.zencode.java.ZenCodeType;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ZenRegister
@ZenCodeType.Name("mods.trading_station.TradingManager")
//@Document("mods/trading_station/melting")
@@ -33,10 +43,24 @@ public class TradingRecipeManager implements IRecipeManager<TradingRecipe> {
* @docParam heatLevel 2
*/
@ZenCodeType.Method
public void addRecipe(String name, IFluidStack output, IIngredient input, int processingTime, int heatLevel ){
public void addRecipe(String name, IItemStack output, IIngredient[] itemInputs, int processingTime, String biome, String[] exclusiveTo ){
name = fixRecipeName(name);
ResourceLocation resourceLocation = new ResourceLocation(TradingStation.MODID, name);
CraftTweakerAPI.apply(new ActionAddRecipe<>( this, new TradingRecipe(resourceLocation, output.getInternal(), input.asVanillaIngredient(), processingTime, heatLevel)));
TradingRecipeBuilder builder = new TradingRecipeBuilder(resourceLocation);
List<Ingredient> ingredients = new ArrayList();
Arrays.stream(itemInputs).forEach((iIngredient) -> {
ingredients.add(iIngredient.asVanillaIngredient());
});
builder.withItemIngredients((Ingredient[])ingredients.toArray(new Ingredient[0]));
builder.withSingleItemOutput(output.asItemLike());
builder.processingTime(processingTime);
builder.withBiomeCondition(BiomeCondition.fromString(biome));
builder.exclusiveTo(ExclusiveToCondition.fromList(List.of(exclusiveTo)));
TradingRecipe recipe = builder.build();
CraftTweakerAPI.apply(new ActionAddRecipe<>(this, recipe));
}
@Override

4
src/main/java/com/oierbravo/trading_station/content/trading_recipe/TradingRecipeBuilder.java
View File

@@ -4,6 +4,7 @@ import net.minecraft.core.NonNullList;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.ItemLike;
import net.minecraftforge.common.crafting.conditions.ICondition;
import java.util.ArrayList;
@@ -31,6 +32,9 @@ public class TradingRecipeBuilder {
params.result = output;
return this;
}
public TradingRecipeBuilder withSingleItemOutput(ItemLike output) {
return withSingleItemOutput(new ItemStack(output));
}
public TradingRecipeBuilder processingTime(int time) {
params.processingTime = time;

2
src/main/java/com/oierbravo/trading_station/content/trading_station/ITradingStationBlockEntity.java
View File

@@ -29,8 +29,6 @@ public interface ITradingStationBlockEntity {
ItemStack getTargetItemStack();
BlockPos getBlockPos();
void setPreferedItem(ItemStack itemStack);
void setItemStack(int slot, ItemStack itemStack, ItemStackSyncS2CPacket.SlotType slotType);

2
src/main/java/com/oierbravo/trading_station/registrate/ModRecipes.java
View File

@@ -55,8 +55,6 @@ public class ModRecipes {
}
public static List<TradingRecipe> getAllRecipesForMachine(Level pLevel, Biome biome, String machineType) {
if(pLevel.isClientSide())
return NonNullList.create();
return pLevel.getRecipeManager().getAllRecipesFor(TradingRecipe.Type.INSTANCE).stream()
.filter((tradingRecipe -> tradingRecipe.matchesBiome(biome, pLevel)))
.filter((tradingRecipe -> tradingRecipe.matchesExclusiveTo(machineType)))

11
src/main/resources/data/trading_station/recipes/trading/emerald.json
View File

@@ -1,11 +0,0 @@
{
"type": "trading_station:trading",
"ingredients": [
{"item": "minecraft:emerald", "count": 5}
],
"result": {
"item": "minecraft:diamond",
"count": 5
},
"processingTime": 500
}

11
src/main/resources/data/trading_station/recipes/trading/loot_book.json
View File

@@ -1,11 +0,0 @@
{
"type": "trading_station:trading",
"ingredients": [
{"item": "minecraft:diamond", "count": 5}
],
"result": {
"item": "minecraft:enchanted_book",
"nbt": "{StoredEnchantments: [{id:\"looting\",lvl:3s}]}"
},
"processingTime": 100
}

19
src/main/resources/data/trading_station/recipes/trading_station_block.json
View File

@@ -1,19 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"S S",
"S S",
"NSN"
],
"key": {
"N": {
"item": "minecraft:iron_nugget"
},
"S": {
"tag": "forge:stone"
}
},
"result": {
"item": "trading_station:trading_station"
}
}