Skip to content

Commit

Permalink
1.3.9.g
Browse files Browse the repository at this point in the history
  • Loading branch information
MarbleGateKeeper committed Jan 2, 2024
1 parent c70d477 commit c688275
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 2 deletions.
4 changes: 4 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ dependencies {
//independent mods
implementation fg.deobf("curse.maven:overweight-farming-591666:${overweight_farming_file}")
implementation fg.deobf("curse.maven:snowy-spirit-566142:${snowy_spirit_file}")

// Fix Botarium incompatible issue
implementation fg.deobf("curse.maven:botarium-704113:4306551")

//utility dependencies
compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}")
Expand Down
7 changes: 7 additions & 0 deletions changelog/1.3.9.g.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## Create Central Kitchen 1.3.9.g

# Update
- Add support for Sticky Basket of Miners Delight

# Bugfix
- Fix incompatible with botarium
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# mod version info
mod_version = 1.3.9.f
mod_version = 1.3.9.g
artifact_minecraft_version = 1.19.2
minecraft_version = 1.19.2
forge_version = 43.2.4
Expand Down Expand Up @@ -57,7 +57,6 @@ peculiars_file = 4433583
respiteful_file = 4463913
seasonals_file = 4030579
cookielicious_file = 4718799
exquisito_file = 4733393
# independent mods
overweight_farming_file = 4395450
snowy_spirit_file = 4734122
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import com.simibubi.create.content.fluids.VirtualFluid;
import com.tterrag.registrate.util.entry.FluidEntry;
import net.brdle.collectorsreap.common.item.CRItems;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.item.Items;
import net.minecraftforge.common.SoundActions;
import plus.dragons.createcentralkitchen.CentralKitchen;
import plus.dragons.createcentralkitchen.foundation.fluid.VirtualFluidFromItem;

import static plus.dragons.createcentralkitchen.CentralKitchen.REGISTRATE;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package plus.dragons.createcentralkitchen.foundation.mixin.common.botarium;

import earth.terrarium.botarium.forge.BotariumForge;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraftforge.event.AttachCapabilitiesEvent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import plus.dragons.createcentralkitchen.api.block.entity.DelegatingSmartTileEntity;

@Mixin(value = BotariumForge.class, remap = false)
public class BotariumForgeMixin {
@Inject(method = "attachBlockCapabilities", at = @At("HEAD"), cancellable = true)
private static void injected(AttachCapabilitiesEvent<BlockEntity> event, CallbackInfo ci) {
Object var2 = event.getObject();
if(var2 instanceof DelegatingSmartTileEntity){
ci.cancel();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package plus.dragons.createcentralkitchen.foundation.mixin.common.minersdelight;

import com.sammy.minersdelight.content.block.sticky_basket.StickyBasketBlockEntity;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import plus.dragons.createcentralkitchen.api.block.entity.SmartBlockEntityLike;
import plus.dragons.createcentralkitchen.content.logistics.block.basket.SmartBasketBlockEntity;
import vectorwing.farmersdelight.common.block.entity.Basket;
import vectorwing.farmersdelight.common.block.entity.BasketBlockEntity;

@Mixin(StickyBasketBlockEntity.class)
public abstract class StickyBasketBlockEntityMixin extends RandomizableContainerBlockEntity implements Basket, SmartBlockEntityLike {

@Unique
private final SmartBlockEntity smartBlockEntity = new SmartBasketBlockEntity((BasketBlockEntity) (Object) this);

private StickyBasketBlockEntityMixin(BlockEntityType<?> pType, BlockPos pPos, BlockState pBlockState) {
super(pType, pPos, pBlockState);
}

@Override
public SmartBlockEntity asSmartBlockEntity() {
return smartBlockEntity;
}

}
2 changes: 2 additions & 0 deletions src/main/resources/create_central_kitchen.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"compatibilityLevel": "JAVA_17",
"refmap": "create_central_kitchen.refmap.json",
"mixins": [
"common.botarium.BotariumForgeMixin",
"common.brewinandchewin.KegBlockEntityMixin",
"common.create.BeltHelperMixin",
"common.create.BlockEntityBehaviourMixin",
Expand All @@ -28,6 +29,7 @@
"common.farmersrespite.TeaBushBlockMixin",
"common.minecraft.BowlFoodItemMixin",
"common.minersdelight.CopperPotBlockEntityMixin",
"common.minersdelight.StickyBasketBlockEntityMixin",
"common.neapolitan.DrinkItemMixin",
"common.overweightfarming.CropFullBlockMixin"
],
Expand Down

0 comments on commit c688275

Please sign in to comment.