Skip to content

Add support for TE centrifuge #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dizzyd wants to merge 1 commit into
base: 1.12
Choose a base branch
from
Open

Add support for TE centrifuge #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/tencao/morebees/MBCore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ object MBCore {
const val VERSION = "1.12.2-2.0.1"
const val DEPS = "required-after:forge@[14.23.4,);" +
"required-after:forgelin@[1.7,);" +
"required-after:forestry@[5.8,);"
"required-after:forestry@[5.8,);" +
"after:thermalexpansion@[5.5,);"

@SidedProxy(clientSide = "com.tencao.morebees.proxy.ClientProxy", serverSide = "com.tencao.morebees.proxy.CommonProxy")
internal lateinit var proxy: CommonProxy
Expand Down
57 changes: 46 additions & 11 deletions src/main/java/com/tencao/morebees/recipes/RecipesCentrifuge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,70 +9,105 @@ import forestry.core.ModuleCore
import net.minecraft.init.Blocks
import net.minecraft.init.Items
import net.minecraft.item.ItemStack
import net.minecraft.nbt.NBTTagCompound
import net.minecraft.nbt.NBTTagList
import net.minecraftforge.fml.common.Loader
import net.minecraftforge.fml.common.event.FMLInterModComms
import kotlin.math.roundToInt

object RecipesCentrifuge {
fun registerRecipe(ticks: Int, input: ItemStack, outputs: Map<ItemStack, Float>) {
RecipeManagers.centrifugeManager.addRecipe(ticks, input, outputs)
registerTECentrifugeRecipe(ticks * 200, input, outputs)
}

fun registerRecipes() {
RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombDirt), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombDirt), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 1.0f,
ItemStack(Blocks.DIRT), 0.9f))

if (Loader.isModLoaded("IC2")) {
RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombRock), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombRock), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 1.0f,
ItemStack(Blocks.STONE, 1, 1), 0.5f,
ItemStack(Blocks.STONE, 1, 3), 0.5f,
ItemStack(Blocks.STONE, 1, 5), 0.5f,
OreDictUtil.getOreStack("dustStone"), 0.9f))
}
if (Loader.isModLoaded("IC2-Classic-Spmod")){
RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombRock), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombRock), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 1.0f,
ItemStack(Blocks.COBBLESTONE), 0.9f,
ItemStack(Blocks.STONE, 1, 1), 0.5f,
ItemStack(Blocks.STONE, 1, 3), 0.5f,
ItemStack(Blocks.STONE, 1, 5), 0.5f))
}

RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombWither), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombWither), ImmutableMap.of(
ModuleCore.getItems().refractoryWax.itemStack, 1.0f,
ItemStack(Items.BONE), 0.9f,
ItemStack(Items.COAL), 0.7f))

RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombSlime), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombSlime), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 1.0f,
ItemStack(Items.SLIME_BALL), 0.9f))


RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombMetallic), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombMetallic), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 0.8f,
ModuleApiculture.getItems().honeyDrop.itemStack, 0.5f,
ItemStack(MBItems.PropolisMetallic), 0.5f))

RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombCrystal), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombCrystal), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 0.8f,
ModuleApiculture.getItems().honeyDrop.itemStack, 0.5f,
ItemStack(MBItems.PropolisCrystal), 0.5f))

RecipeManagers.centrifugeManager.addRecipe(20, ItemStack(MBItems.CombSpectrite), ImmutableMap.of(
registerRecipe(20, ItemStack(MBItems.CombSpectrite), ImmutableMap.of(
ModuleCore.getItems().beeswax.itemStack, 0.8f,
ModuleApiculture.getItems().honeyDrop.itemStack, 0.5f,
ItemStack(MBItems.PropolisSpectrite), 0.35f))

RecipeManagers.centrifugeManager.addRecipe(10, ItemStack(MBItems.PropolisCrystal), ImmutableMap.of(
registerRecipe(10, ItemStack(MBItems.PropolisCrystal), ImmutableMap.of(
ModuleApiculture.getItems().propolis.itemStack, 0.3f,
ItemStack(MBItems.GrainsCrystal), 0.6f,
ItemStack(MBItems.GrainsCrystal), 0.3f))

RecipeManagers.centrifugeManager.addRecipe(10, ItemStack(MBItems.PropolisMetallic), ImmutableMap.of(
registerRecipe(10, ItemStack(MBItems.PropolisMetallic), ImmutableMap.of(
ModuleApiculture.getItems().propolis.itemStack, 0.3f,
ItemStack(MBItems.GrainsMetallic), 0.6f,
ItemStack(MBItems.GrainsMetallic), 0.3f))

RecipeManagers.centrifugeManager.addRecipe(10, ItemStack(MBItems.PropolisSpectrite), ImmutableMap.of(
registerRecipe(10, ItemStack(MBItems.PropolisSpectrite), ImmutableMap.of(
ModuleApiculture.getItems().propolis.itemStack, 0.3f,
ItemStack(MBItems.GrainsSpectrite), 0.5f,
ItemStack(MBItems.GrainsSpectrite), 0.2f))
}

fun registerTECentrifugeRecipe(energy: Int, input: ItemStack, products: Map<ItemStack, Float>) {
// Use the FML inter mod comms mechanism to register new recipes with Thermal Expansion,
// per this example: https://github.com/CoFH/CoFHCore/blob/1.12/src/main/java/cofh/api/util/ThermalExpansionHelper.java

// This approach avoids having to include any build-time dependencies from TE
val msg = NBTTagCompound()
msg.setInteger("energy", energy)
msg.setTag("input", writeToCompound(input))

val outputs = NBTTagList()
for ((item, chance) in products) {
val entry = writeToCompound(item)
entry.setInteger("chance", (chance * 100).roundToInt())
outputs.appendTag(entry)
}

msg.setTag("output", outputs)

FMLInterModComms.sendMessage("thermalexpansion", "addcentrifugerecipe", msg)
}

fun writeToCompound(s : ItemStack) : NBTTagCompound {
val compound = NBTTagCompound()
s.writeToNBT(compound)
return compound
}
}