Skip to content

Commit dbd03fa

Browse files
WaterpickerWaterpicker
committed
Final removal of architectury complete
1 parent f64b3ee commit dbd03fa

File tree

12 files changed

+47
-40
lines changed

12 files changed

+47
-40
lines changed

‎common/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ repositories {
1414

1515
dependencies {
1616
modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
17-
modApi("dev.architectury:architectury:${project.properties["architectury_version"]}")
1817

1918
modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-common-1.21.1", version = "0.0.7")
2019

‎common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package generations.gg.generations.core.generationscore.common
1010
import com.cobblemon.mod.common.api.data.DataProvider
1111
import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail.Companion.registerSpawnType
1212
import com.cobblemon.mod.common.api.storage.player.PlayerDataExtensionRegistry.register
13+
import com.google.common.collect.ArrayListMultimap
1314
import com.mojang.logging.LogUtils
1415
import com.mojang.serialization.MapCodec
1516
import generations.gg.generations.core.generationscore.common.api.GenerationsMolangFunctions
@@ -51,7 +52,9 @@ import net.minecraft.resources.ResourceLocation
5152
import net.minecraft.server.level.ServerPlayer
5253
import net.minecraft.server.packs.PackType
5354
import net.minecraft.world.entity.player.Player
55+
import net.minecraft.world.item.CreativeModeTab
5456
import net.minecraft.world.item.ItemStack
57+
import net.minecraft.world.level.ItemLike
5558
import net.minecraft.world.level.storage.loot.LootPool
5659
import net.minecraft.world.level.storage.loot.entries.NestedLootTable
5760
import org.apache.logging.log4j.util.TriConsumer
@@ -83,6 +86,8 @@ object GenerationsCore {
8386

8487
lateinit var RKS_RESULT_TYPE: RegistryContainer<RksResultType<*>, RksResult<*>>
8588

89+
val tabToItem = ArrayListMultimap.create<ResourceKey<CreativeModeTab>, ItemLike>();
90+
8691
/**
8792
* Initializes the Generations-Core mod.
8893
*/
@@ -214,6 +219,16 @@ object GenerationsCore {
214219
)
215220
}
216221
}
222+
223+
224+
225+
fun <T: ItemLike> addToTab(t: T, tab: ResourceKey<CreativeModeTab>) {
226+
tabToItem.put(tab, t)
227+
}
228+
}
229+
230+
fun <T: ItemLike> T.tab(tab: ResourceKey<CreativeModeTab>): T {
231+
return this.also { GenerationsCore.addToTab(this, tab) }
217232
}
218233

219234
class RegistryContainer<T: Any, V: Any>(name: String, from: (V) -> T, mapCodec: (T) -> MapCodec<out V>, streamCodec: (T) -> StreamCodec<RegistryFriendlyByteBuf, out V>) {

‎common/src/main/java/generations/gg/generations/core/generationscore/common/api/GenerationsMolangFunctions.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import generations.gg.generations.core.generationscore.common.client.model.Model
1717
import generations.gg.generations.core.generationscore.common.config.SpeciesKey
1818
import generations.gg.generations.core.generationscore.common.util.getOrCreate
1919
import generations.gg.generations.core.generationscore.common.util.getProviderOrNull
20-
import generations.gg.generations.core.generationscore.common.util.isSpecies
21-
import generations.gg.generations.core.generationscore.common.util.removePokemon
2220
import generations.gg.generations.core.generationscore.common.world.entity.block.PokemonUtil
2321
import net.minecraft.core.BlockPos
2422
import net.minecraft.core.registries.Registries
@@ -195,7 +193,7 @@ private fun String.parseYaw(player: ServerPlayer): Float =
195193

196194
private fun TagKey<Block>.findNearestYaw(player: ServerPlayer): Float {
197195
return BlockPos.withinManhattanStream(player.onPos, 10, 10, 10)
198-
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.`arch$holder`().`is`(this) }
196+
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.builtInRegistryHolder().`is`(this) }
199197
.findFirst().getOrNull()?.let {
200198
var blockEntity = player.serverLevel().getBlockEntity(it)
201199

@@ -211,7 +209,7 @@ private fun TagKey<Block>.findNearestYaw(player: ServerPlayer): Float {
211209

212210
private fun ResourceKey<Block>.findNearestYaw(player: ServerPlayer): Float {
213211
return BlockPos.withinManhattanStream(player.onPos, 10, 10, 10)
214-
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.`arch$holder`().`is`(this) }
212+
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.builtInRegistryHolder().`is`(this) }
215213
.findFirst().getOrNull()?.let {
216214
var blockEntity = player.serverLevel().getBlockEntity(it)
217215

@@ -231,13 +229,13 @@ private fun String.parsePos(player: ServerPlayer): Vec3 =
231229

232230
private fun TagKey<Block>.findNearestPos(player: ServerPlayer): Vec3 {
233231
return BlockPos.withinManhattanStream(player.onPos, 10, 10, 10)
234-
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.`arch$holder`().`is`(this) }
232+
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.builtInRegistryHolder().`is`(this) }
235233
.findFirst().orElse(player.onPos).center
236234
}
237235

238236
private fun ResourceKey<Block>.findNearestPos(player: ServerPlayer): Vec3 {
239237
return BlockPos.withinManhattanStream(player.onPos, 10, 10, 10)
240-
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.`arch$holder`().`is`(this) }
238+
.filter { it: BlockPos -> player.serverLevel().getBlockState(it).block.builtInRegistryHolder().`is`(this) }
241239
.findFirst().orElse(player.onPos).center
242240
}
243241

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/CookingPotContainer.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class CookingPotContainer @JvmOverloads constructor(
134134

135135
fun isLog(stack: Any): Boolean {
136136
val item = getItem(stack)
137-
return item!!.`arch$holder`().`is`(ItemTags.LOGS_THAT_BURN)
137+
return item!!.builtInRegistryHolder().`is`(ItemTags.LOGS_THAT_BURN)
138138
}
139139

140140
private fun getItem(obj: Any): Item? {

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsArmor.kt‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package generations.gg.generations.core.generationscore.common.world.item
22

33
import generations.gg.generations.core.generationscore.common.GenerationsCore
44
import generations.gg.generations.core.generationscore.common.generationsResource
5+
import generations.gg.generations.core.generationscore.common.tab
56
import generations.gg.generations.core.generationscore.common.util.ItemPlatformRegistry
67
import generations.gg.generations.core.generationscore.common.world.item.armor.ArmorEffect
78
import generations.gg.generations.core.generationscore.common.world.item.armor.GenerationsArmorItem
@@ -17,7 +18,6 @@ import net.minecraft.world.effect.MobEffects
1718
import net.minecraft.world.item.*
1819
import net.minecraft.world.item.enchantment.Enchantment
1920
import net.minecraft.world.item.enchantment.Enchantments
20-
import java.util.function.Function
2121
import java.util.stream.Stream
2222

2323
object GenerationsArmor: ItemPlatformRegistry() {
@@ -29,14 +29,7 @@ object GenerationsArmor: ItemPlatformRegistry() {
2929
name: String,
3030
function: (Item.Properties) -> Item,
3131
tab: ResourceKey<CreativeModeTab>
32-
): Item = create(name.generationsResource(), function.invoke(of().`arch$tab`(tab)))
33-
34-
35-
fun register(
36-
name: String,
37-
function: Function<Item.Properties, Item>,
38-
tab: CreativeModeTab
39-
): Item = create(name.generationsResource(), function.apply(of().`arch$tab`(tab)))
32+
): Item = create(name.generationsResource(), function.invoke(of()).tab(tab))
4033

4134
val AETHER: ArmorSet = ArmorSet.create("aether", GenerationsArmorMaterials.AETHER) {
4235
speed(0.5)

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.cobblemon.mod.common.util.cobblemonResource
1010
import generations.gg.generations.core.generationscore.common.GenerationsCore
1111
import generations.gg.generations.core.generationscore.common.config.LegendKeys
1212
import generations.gg.generations.core.generationscore.common.generationsResource
13+
import generations.gg.generations.core.generationscore.common.tab
1314
import generations.gg.generations.core.generationscore.common.util.ItemPlatformRegistry
1415
import generations.gg.generations.core.generationscore.common.world.GenerationsPokeBalls
1516
import generations.gg.generations.core.generationscore.common.world.entity.GenerationsBoatEntity
@@ -1635,7 +1636,7 @@ object GenerationsItems {
16351636
private fun createMusicDisc(name: String, jukeboxSong: ResourceKey<JukeboxSong>): Item =
16361637
register(
16371638
name,
1638-
{ Item(it.`arch$tab`(CreativeModeTabs.TOOLS_AND_UTILITIES).jukeboxPlayable(jukeboxSong).stacksTo(1)) },
1639+
{ Item(it.jukeboxPlayable(jukeboxSong).stacksTo(1)).tab(CreativeModeTabs.TOOLS_AND_UTILITIES) },
16391640
PLAYER_ITEMS
16401641
)
16411642

‎common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsTools.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ package generations.gg.generations.core.generationscore.common.world.item
22

33
import generations.gg.generations.core.generationscore.common.GenerationsCore
44
import generations.gg.generations.core.generationscore.common.generationsResource
5+
import generations.gg.generations.core.generationscore.common.tab
56
import generations.gg.generations.core.generationscore.common.util.ItemPlatformRegistry
6-
import generations.gg.generations.core.generationscore.common.util.extensions.supplier
77
import generations.gg.generations.core.generationscore.common.world.item.tools.*
88
import generations.gg.generations.core.generationscore.common.world.item.tools.effects.*
9-
import net.minecraft.core.registries.Registries
109
import net.minecraft.resources.ResourceKey
1110
import net.minecraft.resources.ResourceLocation
1211
import net.minecraft.world.effect.MobEffects
1312
import net.minecraft.world.item.*
1413
import net.minecraft.world.item.enchantment.Enchantments
1514
import net.minecraft.world.level.block.Blocks
16-
import java.util.function.Function
17-
import java.util.function.Supplier
1815

1916
object GenerationsTools: ItemPlatformRegistry() {
2017
/**
@@ -67,7 +64,7 @@ object GenerationsTools: ItemPlatformRegistry() {
6764
name: String,
6865
function: (Item.Properties) -> T,
6966
tab: ResourceKey<CreativeModeTab>
70-
): T = create(name.generationsResource(), function.invoke(of().`arch$tab`(tab)))
67+
): T = create(name.generationsResource(), function.invoke(of()).tab(tab))
7168

7269

7370
fun of(): Item.Properties {
@@ -128,3 +125,5 @@ object GenerationsTools: ItemPlatformRegistry() {
128125
}
129126
}
130127
}
128+
129+

‎fabric/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ repositories {
4545
dependencies {
4646
modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
4747
modApi("net.fabricmc.fabric-api:fabric-api:${project.properties["fabric_api_version"]}+$minecraftVersion")
48-
modApi("dev.architectury:architectury-fabric:${project.properties["architectury_version"]}")
4948

5049
"common"(project(":common", "namedElements")) { isTransitive = false }
5150
"shadowBundle"(project(":common", "transformProductionFabric"))

‎fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/AnvilEvents.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22

33
import net.fabricmc.fabric.api.event.Event;
44
import net.fabricmc.fabric.api.event.EventFactory;
5+
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries;
6+
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
57
import net.minecraft.world.entity.player.Player;
8+
import net.minecraft.world.item.CreativeModeTab;
69
import net.minecraft.world.item.ItemStack;
710
import org.jetbrains.annotations.NotNull;
811

912
public class AnvilEvents {
1013
public static final Event<AnvilChange> ANVIL_CHANGE = EventFactory.createArrayBacked(AnvilChange.class, callbacks -> (result, left, right, name, baseCost, player) -> {
1114
for(var callback : callbacks)
12-
if (callback.change(result, left, right, name, baseCost, player)) return true;
15+
if (callback.change(result, left, right, name, baseCost, player)) return true;
1316
return false;
1417
});
1518

‎fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.kt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import net.fabricmc.fabric.api.event.player.UseBlockCallback
2525
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder
2626
import net.fabricmc.fabric.api.event.registry.RegistryAttribute
2727
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup
28+
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents
29+
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents.ModifyEntriesAll
2830
import net.fabricmc.fabric.api.loot.v3.LootTableEvents
2931
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs
3032
import net.fabricmc.fabric.api.registry.CompostingChanceRegistry
@@ -38,6 +40,7 @@ import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerType
3840
import net.fabricmc.loader.api.FabricLoader
3941
import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint
4042
import net.minecraft.core.Registry
43+
import net.minecraft.core.registries.BuiltInRegistries
4144
import net.minecraft.network.FriendlyByteBuf
4245
import net.minecraft.network.chat.Component
4346
import net.minecraft.network.chat.MutableComponent
@@ -62,9 +65,9 @@ import net.minecraft.world.level.ItemLike
6265
import net.minecraft.world.level.block.Block
6366
import java.util.concurrent.CompletableFuture
6467
import java.util.concurrent.Executor
65-
import java.util.function.Consumer
6668
import java.util.function.Function
6769
import java.util.function.Supplier
70+
import kotlin.jvm.optionals.getOrNull
6871

6972

7073
/**
@@ -95,6 +98,11 @@ object GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLau
9598
)
9699
})
97100

101+
ItemGroupEvents.MODIFY_ENTRIES_ALL.register(ModifyEntriesAll { creativeModeTab, helper ->
102+
val list = BuiltInRegistries.CREATIVE_MODE_TAB.getResourceKey(creativeModeTab).getOrNull()?.let(GenerationsCore.tabToItem::get) ?: return@ModifyEntriesAll
103+
list.forEach(helper::accept)
104+
})
105+
98106
LootTableEvents.MODIFY.register{ key, builder, source, lookup ->
99107
GenerationsCore.processLootTable(key.location(), builder::withPool)
100108
}
@@ -157,12 +165,11 @@ object GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLau
157165
.title(Component.translatable("itemGroup." + GenerationsCore.MOD_ID + "." + name))
158166
.icon(icon)
159167
.displayItems { _, context ->
160-
for (item in items) item.all().forEach(
161-
Consumer { itemEntry ->
168+
for (item in items) item.all().forEach { itemEntry ->
162169
context.accept(
163170
itemEntry.asItem().defaultInstance
164171
)
165-
})
172+
}
166173
}.build()
167174

168175
override fun <T : Any> registerEntityDataSerializer(

0 commit comments

Comments
 (0)