6 changes: 2 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ val thermal_expansion_version: String by extra
val thermal_cultivation_version: String by extra

plugins {
id("com.possible-triangle.gradle") version ("0.1.0")
id("com.possible-triangle.gradle") version ("0.1.1")
}

withKotlin()
Expand Down Expand Up @@ -115,9 +115,7 @@ tasks.withType<Jar> {
}

enablePublishing {
repositories {
githubPackages(project)
}
githubPackages()
}

uploadToCurseforge {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ maven_group=com.possible-triangle

kotlin_forge_version=3.12.0
flywheel_version=0.6.8.a-99
create_version=0.5.1.c-298
create_version=0.5.1.f-332
registrate_version=MC1.18.2-1.1.3

jei_version=9.7.0.209
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.possible_triangle.sliceanddice.mixins;

import com.google.common.base.Suppliers;
import com.possible_triangle.sliceanddice.compat.ModCompat;
import com.simibubi.create.content.contraptions.actors.harvester.HarvesterMovementBehaviour;
import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyVariable;

import java.util.function.Supplier;

@Mixin(value = HarvesterMovementBehaviour.class, remap = false)
public class HarvesterMovementBehaviourMixin {

@Unique
private static final Supplier<ItemStack> sliceanddice$TOOL = Suppliers.memoize(ModCompat.INSTANCE::getHarvesterTool);

@ModifyVariable(
require = 0,
method = "visitNewPosition(Lcom/simibubi/create/content/contraptions/behaviour/MovementContext;Lnet/minecraft/core/BlockPos;)V",
at = @At(value = "STORE", ordinal = 0)
)
private ItemStack overwriteDefaultItem(ItemStack stack) {
return sliceanddice$TOOL.get();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class LazyMixingRecipe(params: ProcessingRecipeParams) : MixingRecipe(params) {
private fun fluidOf(ingredient: Ingredient): FluidStack {
if (!Configs.SERVER.REPLACE_FLUID_CONTAINERS.get()) return FluidStack.EMPTY
val fluids = ingredient.items.mapNotNull { stack ->
emptyingRecipes.find {
emptyingRecipes.filter { it.ingredients.isNotEmpty() }.find {
val required = it.ingredients[0]
required.test(stack)
}?.resultingFluid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.possible_triangle.sliceanddice.compat

import com.possible_triangle.sliceanddice.SliceAndDice
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Items
import net.minecraft.world.item.crafting.Recipe
import net.minecraft.world.level.ItemLike
Expand Down Expand Up @@ -33,6 +34,11 @@ object ModCompat : IRecipeInjector {
OverweightFarmingCompat.ifLoaded { injectRecipes(existing, add) }
}

val harvesterTool
get(): ItemStack? {
return ifLoaded(FARMERS_DELIGHT) { ModItems.IRON_KNIFE.get() }?.let(::ItemStack) ?: ItemStack.EMPTY
}

val exampleTool
get(): ItemLike {
return ifLoaded(FARMERS_DELIGHT) { ModItems.IRON_KNIFE.get() } ?: Items.IRON_AXE
Expand Down
17 changes: 17 additions & 0 deletions src/main/resources/assets/sliceanddice/lang/es_mx.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"block.sliceanddice.fertilizer": "Fertilizante líquido",
"block.sliceanddice.slicer": "Rebanador",
"block.sliceanddice.sprinkler": "Regador",
"block.sliceanddice.wet_air": "Aire húmedo",
"fluid.sliceanddice.fertilizer": "Fertilizante líquido",
"item.sliceanddice.fertilizer_bucket": "Cubo de Fertilizante Líquido",
"sliceanddice.gui.contraptions.wrong_direction": "Parece que este %s está rotando en la _dirección incorrecta_.",
"sliceanddice.ponder.slicer.header": "Cortando con el rebanador",
"sliceanddice.ponder.slicer.text_1": "Haz clic derecho en él con una herramienta válida",
"sliceanddice.ponder.slicer.text_2": "El rebanador también puede operar en una pileta",
"sliceanddice.ponder.sprinkler/intro.header": "Rociando por encima",
"sliceanddice.ponder.sprinkler/intro.text_1": "Coloca un regador debajo de una tubería",
"sliceanddice.ponder.sprinkler/uses.header": "Tipos de rociadores",
"sliceanddice.ponder.sprinkler/uses.text_1": "Diferentes fluidos también afectan a las entidades de manera diferente",
"sliceanddice.tooltip.rotationDirection": "Dirección de Rotación"
}
17 changes: 17 additions & 0 deletions src/main/resources/assets/sliceanddice/lang/fr_fr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"block.sliceanddice.fertilizer": "Engrais liquide",
"block.sliceanddice.slicer": "Trancheuse",
"block.sliceanddice.sprinkler": "Arroseur",
"block.sliceanddice.wet_air": "Air humide",
"fluid.sliceanddice.fertilizer": "Engrais liquide",
"item.sliceanddice.fertilizer_bucket": "Seau d'engrais liquide",
"sliceanddice.gui.contraptions.wrong_direction": "Il semblerait que ce(t)(te) %s tourne dans la _mauvaise direction_.",
"sliceanddice.ponder.slicer.header": "Couper avec la trancheuse",
"sliceanddice.ponder.slicer.text_1": "Clic droit avec un outil valide",
"sliceanddice.ponder.slicer.text_2": "La trancheuse peut aussi fonctionner sur un bassin",
"sliceanddice.ponder.sprinkler/intro.header": "Pluie d'arrosage",
"sliceanddice.ponder.sprinkler/intro.text_1": "Placer un arroseur sous un tuyau",
"sliceanddice.ponder.sprinkler/uses.header": "Différents arrosages",
"sliceanddice.ponder.sprinkler/uses.text_1": "Des fluides différents affectent les entités différemment",
"sliceanddice.tooltip.rotationDirection": "Sens de rotation"
}
1 change: 1 addition & 0 deletions src/main/resources/sliceanddice.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"refmap": "${mod_id}.refmap.json",
"mixins": [
"EntityMixin",
"HarvesterMovementBehaviourMixin",
"LevelMixin",
"RecipeEventJSMixin",
"RecipeManagerAccessor",
Expand Down