DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Sort item classes to subpackages, correct some code

Browse Source
This commit is contained in:
DBotThePony 2023-04-16 19:10:27 +07:00
parent c5d9ba34dd
commit cdd6ef9eb3
Signed by: DBot
GPG Key ID: DCC23B5715498507
23 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
View File

@ -46,8 +46,8 @@ import ru.dbotthepony.mc.otm.config.ServerCompatConfig;
import ru.dbotthepony.mc.otm.config.ServerConfig;
import ru.dbotthepony.mc.otm.config.ToolsConfig;
import ru.dbotthepony.mc.otm.core.math.Decimal;
import ru.dbotthepony.mc.otm.item.ExplosiveHammerItem;
import ru.dbotthepony.mc.otm.item.TritaniumArmorItem;
import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem;
import ru.dbotthepony.mc.otm.item.tool.TritaniumArmorItem;
import ru.dbotthepony.mc.otm.item.QuantumBatteryItem;
import ru.dbotthepony.mc.otm.item.weapon.AbstractWeaponItem;
import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem;

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
View File

@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.core.util.WriteOnce
import ru.dbotthepony.mc.otm.graph.matter.MatterGraph
import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode
import ru.dbotthepony.mc.otm.item.MatterDustItem
import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
import ru.dbotthepony.mc.otm.matter.MatterManager
import ru.dbotthepony.mc.otm.menu.matter.MatterDecomposerMenu
import ru.dbotthepony.mc.otm.registry.MBlockEntities

5
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
View File

@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.block.entity.matter
import net.minecraft.core.BlockPos
import net.minecraft.nbt.CompoundTag
import net.minecraft.server.level.ServerLevel
import net.minecraft.world.entity.player.Inventory
import net.minecraft.world.entity.player.Player
import net.minecraft.world.inventory.AbstractContainerMenu
@ -18,14 +17,12 @@ import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl
import ru.dbotthepony.mc.otm.capability.MatteryCapability
import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage
import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage
import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage
import ru.dbotthepony.mc.otm.capability.matter.MatterStorageImpl
import ru.dbotthepony.mc.otm.container.MatteryContainer
import ru.dbotthepony.mc.otm.container.HandlerFilter
import ru.dbotthepony.mc.otm.core.math.Decimal
import ru.dbotthepony.mc.otm.graph.Graph6Node
import ru.dbotthepony.mc.otm.graph.matter.MatterGraph
import ru.dbotthepony.mc.otm.item.MatterDustItem
import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu
import ru.dbotthepony.mc.otm.registry.MBlockEntities
import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue

1
src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralExoPackSlotUpgradeItem.kt
View File

@ -12,6 +12,7 @@ import ru.dbotthepony.mc.otm.core.TranslatableComponent
import ru.dbotthepony.mc.otm.core.nbt.set
import ru.dbotthepony.mc.otm.core.tagNotNull
import ru.dbotthepony.mc.otm.data.loot.IRandomizableItem
import ru.dbotthepony.mc.otm.item.exopack.AbstractExoPackSlotUpgradeItem
import java.util.*
@Suppress("NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") // .tab(null) is a legal statement because tab field itself is nullable

15
src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt
View File

@ -38,7 +38,7 @@ open class SingleUseBatteryItem(
p_41424_: TooltipFlag
) {
super.appendHoverText(itemStack, p_41422_, list, p_41424_)
list.add(SINGLE_USE)
list.add(TranslatableComponent("otm.battery.single_use").withStyle(ChatFormatting.GRAY))
ItemEnergyStorageImpl.appendHoverText(itemStack, list)
}
@ -57,10 +57,6 @@ open class SingleUseBatteryItem(
override fun getBarColor(p_150901_: ItemStack): Int {
return p_150901_.matteryEnergy?.getBarColor() ?: super.getBarColor(p_150901_)
}
companion object {
private val SINGLE_USE = TranslatableComponent("otm.battery.single_use").withStyle(ChatFormatting.GRAY)
}
}
class ZPMItem : SingleUseBatteryItem(ItemsConfig.Batteries.ZPM, Properties().stacksTo(1).rarity(Rarity.EPIC)) {
@ -71,13 +67,6 @@ class ZPMItem : SingleUseBatteryItem(ItemsConfig.Batteries.ZPM, Properties().sta
p_41424_: TooltipFlag
) {
super.appendHoverText(itemStack, p_41422_, list, p_41424_)
list.add(DESCRIPTION)
}
companion object {
val MAX_STORAGE = Decimal(200_000_000_000_000L)
val THROUGHPUT = Decimal(200_000_000L)
private val DESCRIPTION = TranslatableComponent("item.${OverdriveThatMatters.MOD_ID}.zpm_battery.description").withStyle(ChatFormatting.DARK_GRAY)
list.add(TranslatableComponent("$descriptionId.description").withStyle(ChatFormatting.DARK_GRAY))
}
}

3
src/main/kotlin/ru/dbotthepony/mc/otm/item/AbstractExoPackSlotUpgradeItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExoPackSlotUpgradeItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.exopack
import net.minecraft.ChatFormatting
import net.minecraft.network.chat.Component
@ -14,7 +14,6 @@ import net.minecraft.world.item.Rarity
import net.minecraft.world.item.TooltipFlag
import net.minecraft.world.item.UseAnim
import net.minecraft.world.level.Level
import ru.dbotthepony.mc.otm.OverdriveThatMatters
import ru.dbotthepony.mc.otm.config.ServerConfig
import ru.dbotthepony.mc.otm.capability.matteryPlayer
import ru.dbotthepony.mc.otm.client.minecraft

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackCraftingUpgradeItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackCraftingUpgradeItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.exopack
import net.minecraft.ChatFormatting
import net.minecraft.network.chat.Component

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackProbeItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackProbeItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.exopack
import net.minecraft.ChatFormatting
import net.minecraft.network.chat.Component

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoPackSlotUpgradeItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExoPackSlotUpgradeItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.exopack
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Rarity

3
src/main/kotlin/ru/dbotthepony/mc/otm/item/CreativePatternItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.matter
import net.minecraft.ChatFormatting
import net.minecraft.core.Direction
@ -13,7 +13,6 @@ import net.minecraftforge.common.capabilities.Capability
import net.minecraftforge.common.capabilities.ICapabilityProvider
import net.minecraftforge.common.util.LazyOptional
import net.minecraftforge.registries.ForgeRegistries
import ru.dbotthepony.mc.otm.OverdriveThatMatters
import ru.dbotthepony.mc.otm.capability.MatteryCapability
import ru.dbotthepony.mc.otm.capability.matter.IPatternState
import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.matter
import net.minecraft.ChatFormatting
import net.minecraft.MethodsReturnNonnullByDefault

3
src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.matter
import net.minecraft.ChatFormatting
import net.minecraft.network.chat.Component
@ -11,7 +11,6 @@ import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.TooltipFlag
import net.minecraft.world.level.Level
import ru.dbotthepony.mc.otm.config.ItemsConfig
import ru.dbotthepony.mc.otm.config.ServerConfig
import ru.dbotthepony.mc.otm.core.TranslatableComponent
import ru.dbotthepony.mc.otm.core.math.Decimal
import ru.dbotthepony.mc.otm.matter.IMatterItem

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.matter
import net.minecraft.world.item.ItemStack
import net.minecraft.nbt.CompoundTag

27
src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/EnergySwordItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import com.google.common.collect.ImmutableMultimap
import com.google.common.collect.Multimap
@ -45,18 +45,6 @@ import ru.dbotthepony.mc.otm.core.orNull
import ru.dbotthepony.mc.otm.registry.EMPDamageSource
import ru.dbotthepony.mc.otm.core.util.WriteOnce
/**
* This is called from [net.minecraft.world.item.enchantment.EnchantmentHelper.getSweepingDamageRatio]
* by coremod patch
*/
fun getSweepingDamageRatioHook(ply: LivingEntity): Float? {
if (ply.mainHandItem.item is EnergySwordItem && ply.mainHandItem.matteryEnergy?.extractEnergyExact(EnergySwordItem.ENERGY_PER_SWING, true) == true) {
return 1f
}
return null
}
class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE)), Vanishable {
val chargedAttributes: Multimap<Attribute, AttributeModifier>
val dischargedAttributes: Multimap<Attribute, AttributeModifier>
@ -257,6 +245,19 @@ class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE)), Vani
builder.pop()
}
/**
* This is called from [net.minecraft.world.item.enchantment.EnchantmentHelper.getSweepingDamageRatio]
* by coremod patch
*/
@JvmStatic
fun getSweepingDamageRatioHook(ply: LivingEntity): Float? {
if (ply.mainHandItem.item is EnergySwordItem && ply.mainHandItem.matteryEnergy?.extractEnergyExact(ENERGY_PER_SWING, true) == true) {
return 1f
}
return null
}
private val DESCRIPTION = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc").withStyle(ChatFormatting.DARK_GRAY)
private val DESCRIPTION2 = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc2").withStyle(ChatFormatting.DARK_GRAY)
private val DESCRIPTION3 = TranslatableComponent("item.overdrive_that_matters.energy_sword.desc3").withStyle(ChatFormatting.DARK_GRAY)

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/ExplosiveHammerItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import it.unimi.dsi.fastutil.objects.ObjectArraySet
import net.minecraft.ChatFormatting

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryAxeItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/MatteryAxeItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import net.minecraft.world.item.AxeItem
import net.minecraft.world.item.ItemStack

4
src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/PortableGravitationStabilizerItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import net.minecraft.ChatFormatting
import net.minecraft.client.model.HumanoidModel
@ -41,7 +41,7 @@ private object GravitationStabilizerArmorRenderProperties : IClientItemExtension
}
}
class ItemPortableGravitationStabilizer : ArmorItem(GravitationStabilizerArmorMaterial, EquipmentSlot.CHEST, Properties().stacksTo(1).rarity(Rarity.RARE)) {
class PortableGravitationStabilizerItem : ArmorItem(GravitationStabilizerArmorMaterial, EquipmentSlot.CHEST, Properties().stacksTo(1).rarity(Rarity.RARE)) {
override fun initializeClient(consumer: Consumer<IClientItemExtensions>) {
super.initializeClient(consumer)
consumer.accept(GravitationStabilizerArmorRenderProperties)

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleTritaniumArmorItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/SimpleTritaniumArmorItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import net.minecraft.sounds.SoundEvent
import net.minecraft.sounds.SoundEvents

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/TritaniumArmorItem.kt → src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/TritaniumArmorItem.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.item
package ru.dbotthepony.mc.otm.item.tool
import net.minecraft.client.model.HumanoidModel
import net.minecraft.sounds.SoundEvent

2
src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterRecyclerMenu.kt
View File

@ -4,7 +4,7 @@ import net.minecraft.world.SimpleContainer
import net.minecraft.world.entity.player.Inventory
import net.minecraft.world.item.ItemStack
import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity
import ru.dbotthepony.mc.otm.item.MatterDustItem
import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu
import ru.dbotthepony.mc.otm.menu.MatterySlot
import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput

2
src/main/kotlin/ru/dbotthepony/mc/otm/recipe/ExplosiveHammerPrimingRecipe.kt
View File

@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.container.stream
import ru.dbotthepony.mc.otm.core.isActuallyEmpty
import ru.dbotthepony.mc.otm.core.isNotEmpty
import ru.dbotthepony.mc.otm.core.set
import ru.dbotthepony.mc.otm.item.ExplosiveHammerItem
import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem
import ru.dbotthepony.mc.otm.registry.MItems
class ExplosiveHammerPrimingRecipe(private val _id: ResourceLocation, val payload: Ingredient) : CraftingRecipe {

17
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
View File

@ -19,6 +19,19 @@ import ru.dbotthepony.mc.otm.config.ItemsConfig
import ru.dbotthepony.mc.otm.core.collect.SupplierList
import ru.dbotthepony.mc.otm.core.TranslatableComponent
import ru.dbotthepony.mc.otm.item.*
import ru.dbotthepony.mc.otm.item.exopack.ExoPackCraftingUpgradeItem
import ru.dbotthepony.mc.otm.item.exopack.ExoPackProbeItem
import ru.dbotthepony.mc.otm.item.exopack.ExoPackSlotUpgradeItem
import ru.dbotthepony.mc.otm.item.matter.CreativePatternItem
import ru.dbotthepony.mc.otm.item.matter.MatterCapacitorItem
import ru.dbotthepony.mc.otm.item.matter.MatterDustItem
import ru.dbotthepony.mc.otm.item.matter.PatternStorageItem
import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem
import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem
import ru.dbotthepony.mc.otm.item.tool.MatteryAxeItem
import ru.dbotthepony.mc.otm.item.tool.PortableGravitationStabilizerItem
import ru.dbotthepony.mc.otm.item.tool.SimpleTritaniumArmorItem
import ru.dbotthepony.mc.otm.item.tool.TritaniumArmorItem
import ru.dbotthepony.mc.otm.item.weapon.PlasmaRifleItem
object MItems {
@ -190,7 +203,7 @@ object MItems {
val TRITANIUM_SHIELD: ShieldItem by registry.register(MNames.TRITANIUM_SHIELD) { object : ShieldItem(Properties().durability(2048)) {
override fun isValidRepairItem(pToRepair: ItemStack, pRepair: ItemStack): Boolean {
return pRepair.`is`(MItemTags.TRITANIUM_INGOTS)
return pRepair.`is`(MItemTags.REINFORCED_TRITANIUM_PLATES)
}
} }
@ -250,7 +263,7 @@ object MItems {
val GRAVITATION_FIELD_LIMITER: Item by registry.register(MNames.GRAVITATION_FIELD_LIMITER) { Item(DEFAULT_PROPERTIES) }
val GRAVITATION_FIELD_SENSOR: Item by registry.register(MNames.GRAVITATION_FIELD_SENSOR) { Item(DEFAULT_PROPERTIES) }
val PORTABLE_GRAVITATION_STABILIZER: Item by registry.register(MNames.PORTABLE_GRAVITATION_STABILIZER) { ItemPortableGravitationStabilizer() }
val PORTABLE_GRAVITATION_STABILIZER: Item by registry.register(MNames.PORTABLE_GRAVITATION_STABILIZER) { PortableGravitationStabilizerItem() }
val BLACK_HOLE: Item by registry.register(MNames.BLACK_HOLE) { BlockItem(MBlocks.BLACK_HOLE, DEFAULT_PROPERTIES) }

2
src/main/resources/coremods/code_injector.js
View File

@ -894,7 +894,7 @@ function initializeCoreMod() {
var next = new MethodInsnNode(
opcodesRemapped.invokestatic,
'ru/dbotthepony/mc/otm/item/EnergySwordItemKt',
'ru/dbotthepony/mc/otm/item/tool/EnergySwordItem',
'getSweepingDamageRatioHook',
'(Lnet/minecraft/world/entity/LivingEntity;)Ljava/lang/Float;',
false