Skip to content

Commit c3b7fd4

Browse files
committed
修复1
1 parent 5ecd822 commit c3b7fd4

4 files changed

Lines changed: 14 additions & 17 deletions

File tree

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ buildscript {
1717
force 'org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.20'
1818
}
1919
dependencies {
20-
classpath 'xyz.wagyourtail.unimined:unimined:1.4.18-kappa'
2120
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2221
}
2322
}
@@ -26,12 +25,12 @@ plugins {
2625
id 'java'
2726
id 'java-library'
2827
id 'maven-publish'
28+
id 'xyz.wagyourtail.unimined' version '1.4.18-kappa'
2929
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.4.1'
3030
id 'com.gradleup.shadow' version '9.4.0'
3131
id 'com.diffplug.spotless' version '8.4.0'
3232
}
3333

34-
apply plugin: 'xyz.wagyourtail.unimined'
3534
apply plugin: 'kotlin'
3635

3736
apply from: 'gradle/scripts/helpers.gradle'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import WayofTime.bloodmagic.ritual.types.RitualWellOfSuffering
1010
import WayofTime.bloodmagic.tile.TileAltar
1111
import WayofTime.bloodmagic.util.helper.NetworkHelper
1212
import crafttweaker.CraftTweakerAPI.itemUtils
13+
import crafttweaker.annotations.ModOnly
1314
import crafttweaker.annotations.ZenRegister
1415
import crafttweaker.api.item.IIngredient
1516
import crafttweaker.api.item.IItemStack
@@ -53,6 +54,7 @@ import kotlin.math.min
5354
import kotlin.math.pow
5455

5556
@ZenRegister
57+
@ModOnly("bloodmagic")
5658
@ZenClass("novaeng.MMAltar")
5759
object MMAltar : MachineSpecial {
5860

@@ -239,8 +241,8 @@ object MMAltar : MachineSpecial {
239241
pos.release()
240242
if (t is TileLifeEssenceProvider.Output) {
241243
val item = t.inventory.getStackInSlot(0)
242-
val Soul = NetworkHelper.getSoulNetwork(Binding.fromStack(item))
243-
Soul.currentEssence += altar.drainBlood(10000)
244+
val soul = NetworkHelper.getSoulNetwork(Binding.fromStack(item))
245+
soul.currentEssence += altar.drainBlood(10000)
244246
}
245247

246248
}
@@ -412,9 +414,9 @@ object MMAltar : MachineSpecial {
412414
fun registerRecipe(need: Int, maxNeed: Int, altarTier: Int, input: IIngredient, output: IItemStack) {
413415
val time = maxNeed / need
414416
val name: String = when (input) {
415-
is IItemStack -> CraftTweakerMC.getItem(input.definition).getRegistryName().toString() + input.metadata
417+
is IItemStack -> CraftTweakerMC.getItem(input.definition).registryName.toString() + input.metadata
416418
is IOreDictEntry -> input.name
417-
else -> CraftTweakerMC.getItem(output.definition).getRegistryName().toString() + output.metadata
419+
else -> CraftTweakerMC.getItem(output.definition).registryName.toString() + output.metadata
418420
}
419421
RecipeBuilder.newBuilder(name, MACHINEID, time, 1000)
420422
.addItemInputs(input)

src/main/java/github/kasuminova/novaeng/common/tile/ecotech/efabricator/EFabricatorMEChannel.kt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import github.kasuminova.novaeng.common.block.ecotech.efabricator.BlockEFabricat
2626
import github.kasuminova.novaeng.common.tile.ecotech.efabricator.EFabricatorWorker.CraftWork
2727
import hellfirepvp.modularmachinery.ModularMachinery
2828
import net.minecraft.inventory.InventoryCrafting
29-
import net.minecraft.item.Item
3029
import net.minecraft.item.ItemStack
3130
import net.minecraft.nbt.NBTTagCompound
3231
import net.minecraftforge.fluids.FluidStack
@@ -47,10 +46,10 @@ class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost,
4746
ci = ItemStack.EMPTY
4847
}
4948

50-
ci.setCount(stackInSlot.count)
49+
ci.count = stackInSlot.count
5150
return ci
5251
} else if (!stackInSlot.isEmpty) {
53-
stackInSlot.setCount(0)
52+
stackInSlot.count = 0
5453
return stackInSlot
5554
} else return ItemStack.EMPTY
5655
}
@@ -70,11 +69,8 @@ class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost,
7069
val visualItemStack: ItemStack
7170
get() {
7271
val controller: EFabricatorController? = getController()
73-
return ItemStack(
74-
Item.getItemFromBlock(if (controller == null) BlockEFabricatorMEChannel.INSTANCE else controller.parentController!!),
75-
1,
76-
0
77-
)
72+
return if (controller == null) ItemStack(BlockEFabricatorMEChannel.INSTANCE)
73+
else ItemStack(controller.parentController)
7874
}
7975

8076
@MENetworkEventSubscribe
@@ -142,7 +138,7 @@ class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost,
142138
}
143139
}
144140

145-
output.setCount(output.count * size)
141+
output.count *= size
146142

147143
return partController.offerWork(CraftWork(remaining, output, size))
148144
}
@@ -173,7 +169,7 @@ class EFabricatorMEChannel : EFabricatorPart(), ICraftingProvider, IActionHost,
173169
}
174170
}
175171

176-
output.setCount(output.count * size)
172+
output.count *= size
177173

178174
return partController.offerWork(CraftWork(remaining, output, size))
179175
}

0 commit comments

Comments
 (0)