diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index fe94213a2..000000000 --- a/forge/build.gradle +++ /dev/null @@ -1,92 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "8.1.1" -} - -allprojects { - archivesBaseName = "${mod_id}-forge-mc${minecraft_version}" -} - -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath - - forge { - convertAccessWideners = true - extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - mixinConfig("${mod_id}-common.mixins.json", "${mod_id}-forge.mixins.json") - } -} - -architectury { - platformSetupLoomIde() - forge() -} - -configurations { - common - shadowCommon - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentForge.extendsFrom common -} - -configurations.configureEach { - resolutionStrategy.force("net.sf.jopt-simple:jopt-simple:5.0.4") -} - -dependencies { - forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - common(project(path: ":common", configuration: "namedElements")) { transitive = false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } - - // Mixin extras (https://github.com/LlamaLad7/MixinExtras) - compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}")) - implementation(include("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}")) - - // Curios (https://www.curseforge.com/minecraft/mc-mods/curios) - modCompileOnly("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}:api") - modRuntimeOnly("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}") - - // Cloth config (https://www.curseforge.com/minecraft/mc-mods/cloth-config) - modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config_version}") -} - -shadowJar { - exclude "fabric.mod.json" - exclude "architectury.common.json" - - configurations = [project.configurations.shadowCommon] - archiveClassifier.set("dev-shadow") -} - -remapJar { - inputFile.set shadowJar.archiveFile - dependsOn shadowJar - archiveClassifier.set(null) -} - -jar { - archiveClassifier.set("dev") -} - -sourcesJar { - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} - -repositories { - maven { - url = "https://maven.theillusivec4.top/" - } - - maven { url "https://www.cursemaven.com" } - - maven { url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1" } -} \ No newline at end of file diff --git a/forge/gradle.properties b/forge/gradle.properties deleted file mode 100644 index 32f842a63..000000000 --- a/forge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=forge \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/entity/effect/forge/ReachStatusEffectImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/entity/effect/forge/ReachStatusEffectImpl.java deleted file mode 100644 index 74cf5f4cd..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/entity/effect/forge/ReachStatusEffectImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.faboslav.friendsandfoes.common.entity.effect.forge; - -import com.faboslav.friendsandfoes.common.entity.effect.ReachStatusEffect; -import net.minecraft.entity.attribute.EntityAttribute; -import net.minecraftforge.common.ForgeMod; -import org.apache.commons.lang3.NotImplementedException; - -/** - * @see ReachStatusEffect - */ -public class ReachStatusEffectImpl -{ - public static void init() { - throw new NotImplementedException(); - } - - public static EntityAttribute getReachAttribute() { - return ForgeMod.BLOCK_REACH.get(); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/forge/FriendsAndFoesStructureProcessorTypesImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/init/forge/FriendsAndFoesStructureProcessorTypesImpl.java deleted file mode 100644 index afd846e30..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/forge/FriendsAndFoesStructureProcessorTypesImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.faboslav.friendsandfoes.common.init.forge; - -import com.faboslav.friendsandfoes.common.init.FriendsAndFoesStructureProcessorTypes; -import com.faboslav.friendsandfoes.common.init.registry.RegistryEntry; -import com.faboslav.friendsandfoes.forge.world.processor.IceologerCabinArmorStandProcessor; -import com.faboslav.friendsandfoes.forge.world.processor.IllusionerShackItemFrameProcessor; -import net.minecraft.structure.processor.StructureProcessorType; - -public class FriendsAndFoesStructureProcessorTypesImpl -{ - public static final RegistryEntry> ILLUSIONER_SHACK_ITEM_FRAME_PROCESSOR = FriendsAndFoesStructureProcessorTypes.STRUCTURE_PROCESSOR.register("illusioner_shack_item_frame_processor", () -> () -> IllusionerShackItemFrameProcessor.CODEC); - public static final RegistryEntry> ICEOLOGER_CABIN_ARMOR_STAND_PROCESSOR = FriendsAndFoesStructureProcessorTypes.STRUCTURE_PROCESSOR.register("iceologer_cabin_armor_stand_processor", () -> () -> IceologerCabinArmorStandProcessor.CODEC); - - public static void init() { - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeReferenceRegistryEntry.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeReferenceRegistryEntry.java deleted file mode 100644 index 7f5707417..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeReferenceRegistryEntry.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.faboslav.friendsandfoes.common.init.registry.forge; - -import com.faboslav.friendsandfoes.common.init.registry.ReferenceRegistryEntry; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.util.Identifier; -import net.minecraftforge.registries.RegistryObject; - -/** - * Event/registry related is code based on The Bumblezone/Resourceful Lib mods with permissions from the authors - * - * @author TelepathicGrunt - * https://github.com/TelepathicGrunt/Bumblezone - * @author ThatGravyBoat - * https://github.com/Team-Resourceful/ResourcefulLib - */ -public class ForgeReferenceRegistryEntry implements ReferenceRegistryEntry -{ - private final RegistryObject object; - - public ForgeReferenceRegistryEntry(RegistryObject object) { - this.object = object; - } - - @Override - public RegistryEntry referenceRegistryEntry() { - return object; - } - - @Override - public Identifier getId() { - return object.getId(); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeRegistryEntry.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeRegistryEntry.java deleted file mode 100644 index d1ab8b5e9..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeRegistryEntry.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.faboslav.friendsandfoes.common.init.registry.forge; - -import com.faboslav.friendsandfoes.common.init.registry.RegistryEntry; -import net.minecraft.util.Identifier; -import net.minecraftforge.registries.RegistryObject; - -public class ForgeRegistryEntry implements RegistryEntry -{ - - private final RegistryObject object; - - public ForgeRegistryEntry(RegistryObject object) { - this.object = object; - } - - @Override - public T get() { - return object.get(); - } - - @Override - public Identifier getId() { - return object.getId(); - } -} \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeResourcefulRegistry.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeResourcefulRegistry.java deleted file mode 100644 index b0a95d92e..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ForgeResourcefulRegistry.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.faboslav.friendsandfoes.common.init.registry.forge; - -import com.faboslav.friendsandfoes.common.init.registry.ReferenceRegistryEntry; -import com.faboslav.friendsandfoes.common.init.registry.RegistryEntries; -import com.faboslav.friendsandfoes.common.init.registry.RegistryEntry; -import com.faboslav.friendsandfoes.common.init.registry.ResourcefulRegistry; -import net.minecraft.registry.Registry; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; - -import java.util.Collection; -import java.util.function.Supplier; - -public class ForgeResourcefulRegistry implements ResourcefulRegistry -{ - private final DeferredRegister register; - private final RegistryEntries entries = new RegistryEntries<>(); - - public ForgeResourcefulRegistry(Registry registry, String id) { - this.register = DeferredRegister.create(registry.getKey(), id); - } - - @Override - public RegistryEntry register(String id, Supplier supplier) { - return this.entries.add(new ForgeRegistryEntry<>(register.register(id, supplier))); - } - - @Override - public ReferenceRegistryEntry registerReference(String id, Supplier supplier) { - return this.entries.add(new ForgeReferenceRegistryEntry<>(register.register(id, supplier))); - } - - @Override - public Collection> getEntries() { - return this.entries.getEntries(); - } - - @Override - public void init() { - IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus(); - register.register(bus); - } -} \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ResourcefulRegistriesImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ResourcefulRegistriesImpl.java deleted file mode 100644 index ee1949e56..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/init/registry/forge/ResourcefulRegistriesImpl.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.faboslav.friendsandfoes.common.init.registry.forge; - -import com.faboslav.friendsandfoes.common.init.registry.ResourcefulRegistry; -import net.minecraft.registry.Registry; - -public class ResourcefulRegistriesImpl { - public static ResourcefulRegistry create(Registry registry, String id) { - return new ForgeResourcefulRegistry<>(registry, id); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/modcompat/forge/ModCheckerImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/modcompat/forge/ModCheckerImpl.java deleted file mode 100644 index fd2464128..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/modcompat/forge/ModCheckerImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.faboslav.friendsandfoes.common.modcompat.forge; - -import com.faboslav.friendsandfoes.common.FriendsAndFoes; -import com.faboslav.friendsandfoes.forge.modcompat.CuriosCompat; - -import static com.faboslav.friendsandfoes.common.modcompat.ModChecker.loadModCompat; - -public class ModCheckerImpl -{ - public static void setupPlatformModCompat() { - String modId = ""; - - try { - modId = "curios"; - loadModCompat(modId, () -> new CuriosCompat()); - } catch (Throwable e) { - FriendsAndFoes.getLogger().error("Failed to setup compat with " + modId); - e.printStackTrace(); - } - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/BiomeModificationsImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/BiomeModificationsImpl.java deleted file mode 100644 index ab52c37a3..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/BiomeModificationsImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnGroup; -import net.minecraft.registry.tag.TagKey; -import net.minecraft.world.biome.Biome; - -public final class BiomeModificationsImpl -{ - public static void addMobSpawn( - TagKey tag, - EntityType entityType, - SpawnGroup spawnGroup, - int weight, - int minGroupSize, - int maxGroupSize - ) { - } - - public static void addButtercupFeature() { - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ConfigDirectoryImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ConfigDirectoryImpl.java deleted file mode 100644 index f43ba2b85..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ConfigDirectoryImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -import com.faboslav.friendsandfoes.common.platform.ConfigDirectory; -import net.minecraftforge.fml.loading.FMLPaths; - -import java.nio.file.Path; - -public final class ConfigDirectoryImpl -{ - /** - * @see ConfigDirectory#getConfigDirectory() - */ - public static Path getConfigDirectory() { - return FMLPaths.CONFIGDIR.get(); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/CustomSpawnGroupImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/CustomSpawnGroupImpl.java deleted file mode 100644 index d0f5024d1..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/CustomSpawnGroupImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -import com.faboslav.friendsandfoes.common.platform.CustomSpawnGroup; -import net.minecraft.entity.SpawnGroup; - -public final class CustomSpawnGroupImpl -{ - public static SpawnGroup GLARES; - - public static SpawnGroup RASCALS; - - /** - * @see CustomSpawnGroup#getGlaresCategory() - */ - public static SpawnGroup getGlaresCategory() { - var spawnGroup = SpawnGroup.byName(CustomSpawnGroup.GLARES_NAME); - - if (spawnGroup == null) { - spawnGroup = SpawnGroup.create( - CustomSpawnGroup.GLARES_NAME, - CustomSpawnGroup.GLARES_NAME, - CustomSpawnGroup.GLARES_SPAWN_CAP, - CustomSpawnGroup.GLARES_PEACEFUL, - CustomSpawnGroup.GLARES_RARE, - CustomSpawnGroup.GLARES_IMMEDIATE_DESPAWN_RANGE - ); - } - - return spawnGroup; - } - - /** - * @see CustomSpawnGroup#getRascalsCategory() - */ - public static SpawnGroup getRascalsCategory() { - var spawnGroup = SpawnGroup.byName(CustomSpawnGroup.RASCALS_NAME); - - if (spawnGroup == null) { - spawnGroup = SpawnGroup.create( - CustomSpawnGroup.RASCALS_NAME, - CustomSpawnGroup.RASCALS_NAME, - CustomSpawnGroup.RASCALS_SPAWN_CAP, - CustomSpawnGroup.RASCALS_PEACEFUL, - CustomSpawnGroup.RASCALS_RARE, - CustomSpawnGroup.RASCALS_IMMEDIATE_DESPAWN_RANGE - ); - } - - return spawnGroup; - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ModVersionImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ModVersionImpl.java deleted file mode 100644 index ee7578d44..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ModVersionImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -import com.faboslav.friendsandfoes.common.FriendsAndFoes; -import net.minecraftforge.fml.ModList; -import org.jetbrains.annotations.Nullable; - -public final class ModVersionImpl -{ - @Nullable - public static String getModVersion() { - return ModList.get().getModContainerById(FriendsAndFoes.MOD_ID).map(modContainer -> modContainer.getModInfo().getVersion().toString()).orElse(null); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/PlatformImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/PlatformImpl.java deleted file mode 100644 index 0883bd962..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/PlatformImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -import net.minecraftforge.fml.ModList; - -public final class PlatformImpl -{ - public static String getProjectSlug() { - return "friends-and-foes-forge"; - } - - public static boolean isModLoaded(String modId) { - return ModList.get().isLoaded(modId); - } - - private PlatformImpl() { - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ProjectUrlProviderImpl.java b/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ProjectUrlProviderImpl.java deleted file mode 100644 index 2c082bd3c..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/common/platform/forge/ProjectUrlProviderImpl.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.faboslav.friendsandfoes.common.platform.forge; - -public final class ProjectUrlProviderImpl -{ - public static String getCurseForgeProjectLink() { - return "https://www.curseforge.com/minecraft/mc-mods/friends-and-foes-forge"; - } - - public static String getModrinthProjectLink() { - return "https://modrinth.com/mod/friends-and-foes-forge"; - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java deleted file mode 100644 index bde3d27c6..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForge.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.faboslav.friendsandfoes.forge; - -import com.faboslav.friendsandfoes.common.FriendsAndFoes; -import com.faboslav.friendsandfoes.common.events.AddItemGroupEntriesEvent; -import com.faboslav.friendsandfoes.common.events.block.RegisterBlockSetTypeEvent; -import com.faboslav.friendsandfoes.common.events.entity.RegisterVillagerTradesEvent; -import com.faboslav.friendsandfoes.common.events.lifecycle.*; -import com.faboslav.friendsandfoes.common.init.FriendsAndFoesEntityTypes; -import com.faboslav.friendsandfoes.common.init.FriendsAndFoesStructurePoolElements; -import com.faboslav.friendsandfoes.common.init.registry.forge.ResourcefulRegistriesImpl; -import com.faboslav.friendsandfoes.common.util.CustomRaidMember; -import com.faboslav.friendsandfoes.common.util.ServerWorldSpawnersUtil; -import com.faboslav.friendsandfoes.common.util.UpdateChecker; -import com.faboslav.friendsandfoes.common.world.spawner.IceologerSpawner; -import com.faboslav.friendsandfoes.common.world.spawner.IllusionerSpawner; -import com.faboslav.friendsandfoes.forge.init.FriendsAndFoesBiomeModifiers; -import com.faboslav.friendsandfoes.forge.mixin.FireBlockAccessor; -import net.minecraft.block.BlockSetType; -import net.minecraft.block.Blocks; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.registry.Registries; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.village.raid.Raid; -import net.minecraft.world.dimension.DimensionTypes; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.AddReloadListenerEvent; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.event.OnDatapackSyncEvent; -import net.minecraftforge.event.entity.EntityAttributeCreationEvent; -import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent; -import net.minecraftforge.event.level.LevelEvent; -import net.minecraftforge.event.server.ServerAboutToStartEvent; -import net.minecraftforge.event.village.VillagerTradesEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLEnvironment; - -@Mod(FriendsAndFoes.MOD_ID) -public final class FriendsAndFoesForge -{ - public FriendsAndFoesForge() { - UpdateChecker.checkForNewUpdates(); - - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - IEventBus eventBus = MinecraftForge.EVENT_BUS; - - modEventBus.addListener(EventPriority.NORMAL, ResourcefulRegistriesImpl::onRegisterForgeRegistries); - FriendsAndFoes.init(); - FriendsAndFoesBiomeModifiers.BIOME_MODIFIERS.register(modEventBus); - - if (FMLEnvironment.dist == Dist.CLIENT) { - FriendsAndFoesForgeClient.init(modEventBus, eventBus); - } - - eventBus.addListener(FriendsAndFoesForge::initSpawners); - eventBus.addListener(FriendsAndFoesForge::onServerAboutToStartEvent); - eventBus.addListener(FriendsAndFoesForge::onAddVillagerTrades); - eventBus.addListener(FriendsAndFoesForge::onAddReloadListeners); - eventBus.addListener(FriendsAndFoesForge::onDatapackSync); - modEventBus.addListener(FriendsAndFoesForge::onSetup); - modEventBus.addListener(FriendsAndFoesForge::onRegisterAttributes); - modEventBus.addListener(FriendsAndFoesForge::onRegisterSpawnRestrictions); - modEventBus.addListener(FriendsAndFoesForge::onAddItemGroupEntries); - } - - private static void onSetup(final FMLCommonSetupEvent event) { - SetupEvent.EVENT.invoke(new SetupEvent(event::enqueueWork)); - - event.enqueueWork(() -> { - FriendsAndFoes.lateInit(); - - if (FriendsAndFoes.getConfig().enableIceologer && FriendsAndFoes.getConfig().enableIceologerInRaids) { - Raid.Member.create( - CustomRaidMember.ICEOLOGER_INTERNAL_NAME, - FriendsAndFoesEntityTypes.ICEOLOGER.get(), - CustomRaidMember.ICEOLOGER_COUNT_IN_WAVE - ); - } - - if (FriendsAndFoes.getConfig().enableIllusioner && FriendsAndFoes.getConfig().enableIllusionerInRaids) { - Raid.Member.create( - CustomRaidMember.ILLUSIONER_INTERNAL_NAME, - EntityType.ILLUSIONER, - CustomRaidMember.ILLUSIONER_COUNT_IN_WAVE - ); - } - - RegisterBlockSetTypeEvent.EVENT.invoke(new RegisterBlockSetTypeEvent(BlockSetType::register)); - RegisterFlammabilityEvent.EVENT.invoke(new RegisterFlammabilityEvent((item, igniteOdds, burnOdds) -> - ((FireBlockAccessor) Blocks.FIRE).invokeRegisterFlammableBlock(item, igniteOdds, burnOdds))); - }); - } - - private static void onAddReloadListeners(AddReloadListenerEvent event) { - RegisterReloadListenerEvent.EVENT.invoke(new RegisterReloadListenerEvent((id, listener) -> event.addListener(listener))); - } - - private static void onDatapackSync(OnDatapackSyncEvent event) { - if (FMLEnvironment.dist.isDedicatedServer()) { - if (event.getPlayer() != null) { - DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(event.getPlayer())); - } else { - event.getPlayerList().getPlayerList().forEach(player -> DatapackSyncEvent.EVENT.invoke(new DatapackSyncEvent(player))); - } - } - } - - private static void onAddVillagerTrades(VillagerTradesEvent event) { - RegisterVillagerTradesEvent.EVENT.invoke(new RegisterVillagerTradesEvent(event.getType(), (i, listing) -> event.getTrades().get(i.intValue()).add(listing))); - } - - private static void onAddItemGroupEntries(BuildCreativeModeTabContentsEvent event) { - AddItemGroupEntriesEvent.EVENT.invoke( - new AddItemGroupEntriesEvent( - AddItemGroupEntriesEvent.Type.toType(Registries.ITEM_GROUP.getKey(event.getTab()).orElse(null)), - event.getTab(), - event.hasPermissions(), - event::add - ) - ); - } - - private static void onRegisterAttributes(EntityAttributeCreationEvent event) { - RegisterEntityAttributesEvent.EVENT.invoke(new RegisterEntityAttributesEvent((entity, builder) -> event.put(entity, builder.build()))); - } - - private static void onRegisterSpawnRestrictions(SpawnPlacementRegisterEvent event) { - RegisterEntitySpawnRestrictionsEvent.EVENT.invoke(new RegisterEntitySpawnRestrictionsEvent(FriendsAndFoesForge.registerEntitySpawnRestriction(event))); - } - - private static RegisterEntitySpawnRestrictionsEvent.Registrar registerEntitySpawnRestriction( - SpawnPlacementRegisterEvent event - ) { - return new RegisterEntitySpawnRestrictionsEvent.Registrar() - { - @Override - public void register( - EntityType type, - RegisterEntitySpawnRestrictionsEvent.Placement placement - ) { - event.register(type, placement.location(), placement.heightmap(), placement.predicate(), SpawnPlacementRegisterEvent.Operation.AND); - } - }; - } - - private static void initSpawners(final LevelEvent.Load event) { - if ( - event.getLevel().isClient() - || ((ServerWorld) event.getLevel()).getDimensionEntry() != DimensionTypes.OVERWORLD) { - return; - } - - var server = event.getLevel().getServer(); - - if (server == null) { - return; - } - - var world = server.getOverworld(); - - if (world == null) { - return; - } - - ServerWorldSpawnersUtil.register(world, new IceologerSpawner()); - ServerWorldSpawnersUtil.register(world, new IllusionerSpawner()); - } - - public static void onServerAboutToStartEvent(ServerAboutToStartEvent event) { - FriendsAndFoesStructurePoolElements.init(event.getServer()); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForgeClient.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForgeClient.java deleted file mode 100644 index c470b10f6..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/FriendsAndFoesForgeClient.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.faboslav.friendsandfoes.forge; - -import com.faboslav.friendsandfoes.common.FriendsAndFoes; -import com.faboslav.friendsandfoes.common.FriendsAndFoesClient; -import com.faboslav.friendsandfoes.common.config.ConfigScreenBuilder; -import com.faboslav.friendsandfoes.common.events.client.*; -import com.faboslav.friendsandfoes.common.events.lifecycle.ClientSetupEvent; -import com.faboslav.friendsandfoes.common.init.FriendsAndFoesItems; -import com.faboslav.friendsandfoes.common.init.registry.RegistryEntry; -import com.faboslav.friendsandfoes.common.item.DispenserAddedSpawnEgg; -import net.minecraft.client.particle.ParticleFactory; -import net.minecraft.client.particle.SpriteProvider; -import net.minecraft.client.render.RenderLayers; -import net.minecraft.particle.ParticleEffect; -import net.minecraft.particle.ParticleType; -import net.minecraftforge.client.ConfigScreenHandler; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.client.event.RegisterColorHandlersEvent; -import net.minecraftforge.client.event.RegisterParticleProvidersEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; - -import java.util.function.Function; - -@SuppressWarnings({"all", "removal", "deprecated"}) -public final class FriendsAndFoesForgeClient -{ - public static void init(IEventBus modEventBus, IEventBus eventBus) { - FriendsAndFoesClient.init(); - - modEventBus.addListener(FriendsAndFoesForgeClient::onClientSetup); - modEventBus.addListener(FriendsAndFoesForgeClient::onRegisterParticles); - modEventBus.addListener(FriendsAndFoesForgeClient::onRegisterItemColors); - modEventBus.addListener(FriendsAndFoesForgeClient::onRegisterEntityRenderers); - modEventBus.addListener(FriendsAndFoesForgeClient::onRegisterEntityLayers); - } - - private static void onClientSetup(final FMLClientSetupEvent event) { - event.enqueueWork(() -> { - ClientSetupEvent.EVENT.invoke(new ClientSetupEvent(Runnable::run)); - RegisterRenderLayersEvent.EVENT.invoke(new RegisterRenderLayersEvent(RenderLayers::setRenderLayer, RenderLayers::setRenderLayer)); - - if (ModList.get().isLoaded("cloth_config")) { - ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> - new ConfigScreenHandler.ConfigScreenFactory( - (mc, screen) -> ConfigScreenBuilder.createConfigScreen(FriendsAndFoes.getConfig(), screen) - ) - ); - } - }); - } - - private static void onRegisterEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - RegisterEntityRenderersEvent.EVENT.invoke(new RegisterEntityRenderersEvent(event::registerEntityRenderer)); - } - - private static void onRegisterEntityLayers(EntityRenderersEvent.RegisterLayerDefinitions event) { - RegisterEntityLayersEvent.EVENT.invoke(new RegisterEntityLayersEvent(event::registerLayerDefinition)); - } - - private static void onRegisterParticles(RegisterParticleProvidersEvent event) { - RegisterParticlesEvent.EVENT.invoke(new RegisterParticlesEvent(FriendsAndFoesForgeClient.registerParticle(event))); - } - - private static RegisterParticlesEvent.Registrar registerParticle(RegisterParticleProvidersEvent event) { - return new RegisterParticlesEvent.Registrar() - { - @Override - public void register( - ParticleType type, - Function> registration - ) { - event.registerSpriteSet(type, registration::apply); - } - }; - } - - private static void onRegisterItemColors(RegisterColorHandlersEvent.Item event) { - RegisterItemColorEvent.EVENT.invoke(new RegisterItemColorEvent(event::register, event.getBlockColors()::getColor)); - FriendsAndFoesItems.ITEMS.stream() - .map(RegistryEntry::get) - .filter(item -> item instanceof DispenserAddedSpawnEgg) - .map(item -> (DispenserAddedSpawnEgg) item) - .forEach(item -> event.register((stack, index) -> item.getColor(index), item)); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/init/FriendsAndFoesBiomeModifiers.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/init/FriendsAndFoesBiomeModifiers.java deleted file mode 100644 index 458a56094..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/init/FriendsAndFoesBiomeModifiers.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.faboslav.friendsandfoes.forge.init; - -import com.faboslav.friendsandfoes.common.FriendsAndFoes; -import com.faboslav.friendsandfoes.forge.worldgen.MobSpawnsBiomeModifier; -import com.mojang.serialization.Codec; -import net.minecraftforge.common.world.BiomeModifier; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -public class FriendsAndFoesBiomeModifiers -{ - public static final DeferredRegister> BIOME_MODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, FriendsAndFoes.MOD_ID); - - public static final RegistryObject> BIOME_MODIFIER = BIOME_MODIFIERS.register("mob_spawns", () -> MobSpawnsBiomeModifier.CODEC); -} \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/mixin/FireBlockAccessor.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/mixin/FireBlockAccessor.java deleted file mode 100644 index 9fc867d95..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/mixin/FireBlockAccessor.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.faboslav.friendsandfoes.forge.mixin; - -import net.minecraft.block.Block; -import net.minecraft.block.FireBlock; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(FireBlock.class) -public interface FireBlockAccessor -{ - @Invoker("registerFlammableBlock") - void invokeRegisterFlammableBlock(Block block, int burnChance, int spreadChance); -} \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/CuriosCompat.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/CuriosCompat.java deleted file mode 100644 index b499ffea7..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/CuriosCompat.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.faboslav.friendsandfoes.forge.modcompat; - -import com.faboslav.friendsandfoes.common.modcompat.ModCompat; - -/* -import com.faboslav.friendsandfoes.common.events.lifecycle.ClientSetupEvent; -import com.faboslav.friendsandfoes.common.init.FriendsAndFoesItems; -import com.faboslav.friendsandfoes.common.modcompat.ModCompat; -import com.faboslav.friendsandfoes.forge.modcompat.curios.CuriosTotemRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraftforge.fml.InterModComms; -import org.jetbrains.annotations.Nullable; -import top.theillusivec4.curios.api.CuriosApi; -import top.theillusivec4.curios.api.SlotResult; -import top.theillusivec4.curios.api.SlotTypeMessage; -import top.theillusivec4.curios.api.SlotTypePreset; -import top.theillusivec4.curios.api.client.CuriosRendererRegistry; - -import java.util.EnumSet; -import java.util.function.Predicate; -*/ -@SuppressWarnings({"all", "removal", "deprecated"}) -public final class CuriosCompat implements ModCompat -{ - public CuriosCompat() { - //InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.CHARM.getMessageBuilder().build()); - //ClientSetupEvent.EVENT.addListener(CuriosCompat::registerRenderers); - } - - /* - private static void registerRenderers(final ClientSetupEvent clientSetupEvent) { - CuriosRendererRegistry.register(Items.TOTEM_OF_UNDYING, CuriosTotemRenderer::new); - CuriosRendererRegistry.register(FriendsAndFoesItems.TOTEM_OF_FREEZING.get(), CuriosTotemRenderer::new); - CuriosRendererRegistry.register(FriendsAndFoesItems.TOTEM_OF_ILLUSION.get(), CuriosTotemRenderer::new); - } - - @Override - public EnumSet compatTypes() { - return EnumSet.of(Type.CUSTOM_EQUIPMENT_SLOTS); - } - - @Override - @Nullable - public ItemStack getEquippedItemFromCustomSlots(Entity entity, Predicate itemStackPredicate) { - if (entity instanceof PlayerEntity player) { - return CuriosApi.getCuriosHelper().findFirstCurio(player, itemStackPredicate).map(SlotResult::stack).orElse(null); - } - - return null; - }*/ -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/curios/CuriosTotemRenderer.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/curios/CuriosTotemRenderer.java deleted file mode 100644 index 7ce3bbdfe..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/modcompat/curios/CuriosTotemRenderer.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.faboslav.friendsandfoes.forge.modcompat.curios; - -/* -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.OverlayTexture; -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.entity.feature.FeatureRendererContext; -import net.minecraft.client.render.entity.model.EntityModel; -import net.minecraft.client.render.model.json.ModelTransformationMode; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.Direction; -import top.theillusivec4.curios.api.SlotContext; -import top.theillusivec4.curios.api.client.ICurioRenderer; - -public class CuriosTotemRenderer implements ICurioRenderer -{ - @Override - public > void render( - ItemStack itemStack, - SlotContext slotContext, - MatrixStack matrices, - FeatureRendererContext featureRendererContext, - VertexConsumerProvider vertexConsumers, - int light, - float limbSwing, - float limbSwingAmount, - float partialTicks, - float ticks, - float headYaw, - float headPitch - ) { - var livingEntity = slotContext.entity(); - ICurioRenderer.translateIfSneaking(matrices, livingEntity); - ICurioRenderer.rotateIfSneaking(matrices, livingEntity); - - matrices.scale(0.35F, 0.35F, 0.35F); - matrices.translate(0.0F, 1.1F, -0.4F); - matrices.multiply(Direction.DOWN.getRotationQuaternion()); - - MinecraftClient.getInstance().getItemRenderer().renderItem( - itemStack, - ModelTransformationMode.FIXED, - light, - OverlayTexture.DEFAULT_UV, - matrices, - vertexConsumers, - null, - 0 - ); - } -}*/ \ No newline at end of file diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IceologerCabinArmorStandProcessor.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IceologerCabinArmorStandProcessor.java deleted file mode 100644 index 2a6b2476f..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IceologerCabinArmorStandProcessor.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.faboslav.friendsandfoes.forge.world.processor; - -import com.faboslav.friendsandfoes.common.init.forge.FriendsAndFoesStructureProcessorTypesImpl; -import com.faboslav.friendsandfoes.common.util.world.processor.IceologerCabinArmorStandProcessorHelper; -import com.mojang.serialization.Codec; -import net.minecraft.structure.StructurePlacementData; -import net.minecraft.structure.StructureTemplate; -import net.minecraft.structure.processor.StructureProcessor; -import net.minecraft.structure.processor.StructureProcessorType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldView; -import org.jetbrains.annotations.Nullable; - -/** - * Inspired by use in Better Strongholds mod - * - * @author YUNGNICKYOUNG - * https://github.com/YUNG-GANG/YUNGs-Better-Strongholds - */ -public final class IceologerCabinArmorStandProcessor extends StructureProcessor -{ - public static final IceologerCabinArmorStandProcessor INSTANCE = new IceologerCabinArmorStandProcessor(); - public static final Codec CODEC = Codec.unit(() -> INSTANCE); - - @Override - public StructureTemplate.StructureEntityInfo processEntity( - WorldView world, - BlockPos seedPos, - StructureTemplate.StructureEntityInfo rawEntityInfo, - StructureTemplate.StructureEntityInfo entityInfo, - StructurePlacementData placementSettings, - StructureTemplate template - ) { - return IceologerCabinArmorStandProcessorHelper.processEntity( - entityInfo, - placementSettings - ); - } - - @Nullable - @Override - public StructureTemplate.StructureBlockInfo process( - WorldView world, - BlockPos pos, - BlockPos pivot, - StructureTemplate.StructureBlockInfo localEntityInfo, - StructureTemplate.StructureBlockInfo globalEntityInfo, - StructurePlacementData data - ) { - return globalEntityInfo; - } - - @Override - protected StructureProcessorType getType() { - return FriendsAndFoesStructureProcessorTypesImpl.ICEOLOGER_CABIN_ARMOR_STAND_PROCESSOR.get(); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IllusionerShackItemFrameProcessor.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IllusionerShackItemFrameProcessor.java deleted file mode 100644 index cb382385c..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/world/processor/IllusionerShackItemFrameProcessor.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.faboslav.friendsandfoes.forge.world.processor; - -import com.faboslav.friendsandfoes.common.init.forge.FriendsAndFoesStructureProcessorTypesImpl; -import com.faboslav.friendsandfoes.common.util.world.processor.IllusionerShackItemFrameProcessorHelper; -import com.mojang.serialization.Codec; -import net.minecraft.structure.StructurePlacementData; -import net.minecraft.structure.StructureTemplate; -import net.minecraft.structure.processor.StructureProcessor; -import net.minecraft.structure.processor.StructureProcessorType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldView; -import org.jetbrains.annotations.Nullable; - -/** - * Inspired by use in Better Strongholds mod - * - * @author YUNGNICKYOUNG - * https://github.com/YUNG-GANG/YUNGs-Better-Strongholds - */ -public final class IllusionerShackItemFrameProcessor extends StructureProcessor -{ - public static final IllusionerShackItemFrameProcessor INSTANCE = new IllusionerShackItemFrameProcessor(); - public static final Codec CODEC = Codec.unit(() -> INSTANCE); - - @Override - public StructureTemplate.StructureEntityInfo processEntity( - WorldView world, - BlockPos seedPos, - StructureTemplate.StructureEntityInfo rawEntityInfo, - StructureTemplate.StructureEntityInfo entityInfo, - StructurePlacementData placementSettings, - StructureTemplate template - ) { - return IllusionerShackItemFrameProcessorHelper.processEntity( - entityInfo, - placementSettings - ); - } - - @Nullable - @Override - public StructureTemplate.StructureBlockInfo process( - WorldView world, - BlockPos pos, - BlockPos pivot, - StructureTemplate.StructureBlockInfo localEntityInfo, - StructureTemplate.StructureBlockInfo globalEntityInfo, - StructurePlacementData data - ) { - return globalEntityInfo; - } - - @Override - protected StructureProcessorType getType() { - return FriendsAndFoesStructureProcessorTypesImpl.ILLUSIONER_SHACK_ITEM_FRAME_PROCESSOR.get(); - } -} diff --git a/forge/src/main/java/com/faboslav/friendsandfoes/forge/worldgen/MobSpawnsBiomeModifier.java b/forge/src/main/java/com/faboslav/friendsandfoes/forge/worldgen/MobSpawnsBiomeModifier.java deleted file mode 100644 index 294b451b7..000000000 --- a/forge/src/main/java/com/faboslav/friendsandfoes/forge/worldgen/MobSpawnsBiomeModifier.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.faboslav.friendsandfoes.forge.worldgen; - -import com.faboslav.friendsandfoes.common.events.lifecycle.AddSpawnBiomeModificationsEvent; -import com.faboslav.friendsandfoes.forge.init.FriendsAndFoesBiomeModifiers; -import com.mojang.serialization.Codec; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.SpawnSettings; -import net.minecraftforge.common.world.BiomeModifier; -import net.minecraftforge.common.world.ModifiableBiomeInfo; - -public class MobSpawnsBiomeModifier implements BiomeModifier -{ - public static final Codec CODEC = Codec.unit(MobSpawnsBiomeModifier::new); - - public MobSpawnsBiomeModifier() { - } - - public void modify(RegistryEntry biome, Phase phase, ModifiableBiomeInfo.BiomeInfo.Builder builder) { - if (phase == Phase.ADD) { - AddSpawnBiomeModificationsEvent.EVENT.invoke(new AddSpawnBiomeModificationsEvent((tag, spawnGroup, entityType, spawnWeight, minGroupSize, maxGroupSize) -> { - if (biome.isIn(tag)) { - builder.getMobSpawnSettings().getSpawner(spawnGroup).add(new SpawnSettings.SpawnEntry(entityType, spawnWeight, minGroupSize, maxGroupSize)); - } - })); - } - } - - public Codec codec() { - return FriendsAndFoesBiomeModifiers.BIOME_MODIFIER.get(); - } -} \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 483464424..000000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,28 +0,0 @@ -modLoader = "javafml" -loaderVersion = "*" -license = "CC-BY-NC-ND-4.0" -issueTrackerURL = "https://github.com/Faboslav/friends-and-foes/issues" - -[[mods]] -modId = "${modId}" -version = "${modVersion}" -displayName = "${modName}" -authors = "${modAuthor}" -description = "${modDescription}" -logoFile = "icon.png" -displayURL = "https://github.com/Faboslav/friends-and-foes" - -[[dependencies.${ modId }]] -modId = "forge" -mandatory = true -versionRange = "[${forgeVersion},)" - -[[dependencies.${ modId }]] -modId = "minecraft" -mandatory = true -versionRange = "[${minMinecraftVersion},)" - -[modproperties.${ modId }] -catalogueImageIcon = "catalogue_icon.png" -catalogueBackground = "catalogue_background.png" -configuredBackground = "catalogue_background.png" \ No newline at end of file diff --git a/forge/src/main/resources/data/curios/tags/items/charm.json b/forge/src/main/resources/data/curios/tags/items/charm.json deleted file mode 100644 index 79c6affe2..000000000 --- a/forge/src/main/resources/data/curios/tags/items/charm.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "replace": false, - "values": [ - "#friendsandfoes:totems", - "minecraft:totem_of_undying", - { - "id": "biomemakeover:enchanted_totem", - "required": false - }, - { - "id": "voidtotem:totem_of_void_undying", - "required": false - }, - { - "id": "#voidtotem:additional_totems", - "required": false - }, - { - "id": "fwaystones:void_totem", - "required": false - }, - { - "id": "netheriteextras:totem_of_neverdying", - "required": false - } - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/friendsandfoes/curios/entities/totems.json b/forge/src/main/resources/data/friendsandfoes/curios/entities/totems.json deleted file mode 100644 index 9bc682614..000000000 --- a/forge/src/main/resources/data/friendsandfoes/curios/entities/totems.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "entities": [ - "player" - ], - "slots": [ - "charm" - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/data/friendsandfoes/forge/biome_modifier/mob_spawns.json b/forge/src/main/resources/data/friendsandfoes/forge/biome_modifier/mob_spawns.json deleted file mode 100644 index b6f93c1a5..000000000 --- a/forge/src/main/resources/data/friendsandfoes/forge/biome_modifier/mob_spawns.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "friendsandfoes:mob_spawns" -} \ No newline at end of file diff --git a/forge/src/main/resources/friendsandfoes-forge.mixins.json b/forge/src/main/resources/friendsandfoes-forge.mixins.json deleted file mode 100644 index 36d745a2c..000000000 --- a/forge/src/main/resources/friendsandfoes-forge.mixins.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "required": true, - "package": "com.faboslav.friendsandfoes.forge.mixin", - "compatibilityLevel": "JAVA_${modJavaVersion}", - "minVersion": "0.8", - "injectors": { - "defaultRequire": 1 - }, - "mixins": [ - "FireBlockAccessor" - ] -} \ No newline at end of file diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta deleted file mode 100644 index cfed13ab1..000000000 --- a/forge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "Friends&Foes", - "pack_format": 8 - } -}