Skip to content

Minimize use of Architectury API #13

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

Merged
JT122406 merged 4 commits into from
Aug 1, 2023
Merged

Minimize use of Architectury API #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77c67c5
Don't use Arch for Strippables
JT122406 Jul 28, 2023
97c9025
Don't use Arch GameInstance
JT122406 Jul 28, 2023
e552254
Remove use of arch's ClientLifecycleEvent
JT122406 Jul 28, 2023
297c47a
Updates before merge
JT122406 Aug 1, 2023
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
6 changes: 3 additions & 3 deletions ...n/src/main/java/generations/gg/generations/core/generationscore/compat/VanillaCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package generations.gg.generations.core.generationscore.compat;

import dev.architectury.hooks.item.tool.AxeItemHooks;
import dev.architectury.registry.CreativeTabOutput;
import dev.architectury.registry.CreativeTabRegistry;
import generations.gg.generations.core.generationscore.GenerationsCore;
Expand All @@ -13,6 +12,7 @@
import generations.gg.generations.core.generationscore.world.level.block.GenerationsWood;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.*;
import org.jetbrains.annotations.NotNull;

public class VanillaCompat {

Expand All @@ -37,8 +37,8 @@ public static void setup() {
* @param log The log block of wood
* @param stripped The stripped log block of wood
*/
private static void registerStrippable(Block log, Block stripped) {
AxeItemHooks.addStrippable(log, stripped);
private static void registerStrippable(@NotNull Block log, @NotNull Block stripped) {
AxeItem.STRIPPABLES.put(log, stripped);
}

/**
Expand Down
19 changes: 7 additions & 12 deletions ...java/generations/gg/generations/core/generationscore/world/level/block/BallLootBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package generations.gg.generations.core.generationscore.world.level.block;

import dev.architectury.utils.GameInstance;
import generations.gg.generations.core.generationscore.GenerationsCore;
import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntityModels;
import generations.gg.generations.core.generationscore.world.level.block.entities.BallLootBlockEntity;
import generations.gg.generations.core.generationscore.world.level.block.entities.BallLootBlockEntity.LootMode;
import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntities;
import generations.gg.generations.core.generationscore.world.level.block.entities.GenerationsBlockEntityModels;
import generations.gg.generations.core.generationscore.world.level.block.generic.GenericRotatableModelBlock;
import generations.gg.generations.core.generationscore.world.sound.GenerationsSounds;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.client.resources.language.I18n;
import net.minecraft.core.BlockPos;
import net.minecraft.core.NonNullList;
Expand All @@ -29,13 +27,13 @@
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.loot.LootParams;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.stream.Collectors;
Expand All @@ -52,7 +50,7 @@ protected BallLootBlock(String name, Properties properties) {
}

@Override
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
public @NotNull InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if(level.isClientSide || hand == InteractionHand.OFF_HAND) {
return InteractionResult.CONSUME;
}
Expand Down Expand Up @@ -144,15 +142,12 @@ public ResourceLocation getLootTableId() {
}

public NonNullList<ItemStack> getDrops(ServerLevel level, BlockPos pos, Player player) {
var lootTableId = this.getLootTableId();
LootTable lootTable = GameInstance.getServer().getLootData().getLootTable(lootTableId);

LootParams.Builder builder = (new LootParams.Builder(level)).withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos));
if (player != null) {
if (player != null)
builder.withLuck(player.getLuck()).withParameter(LootContextParams.THIS_ENTITY, player);
}

return lootTable.getRandomItems(builder.create(LootContextParamSets.CHEST)).stream().collect(Collectors.toCollection(NonNullList::create));

return level.getServer().getLootData().getLootTable(this.getLootTableId()).getRandomItems(builder.create(LootContextParamSets.CHEST)).stream().collect(Collectors.toCollection(NonNullList::create));
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"depends": {
"fabricloader": ">=0.14.21",
"minecraft": ">=1.20.1",
"architectury": ">=9.1.11"
"architectury": ">=9.1.12"
}
}
16 changes: 9 additions & 7 deletions ...erations/gg/generations/core/generationscore/forge/client/GenerationsCoreClientForge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package generations.gg.generations.core.generationscore.forge.client;

import dev.architectury.event.events.client.ClientLifecycleEvent;
import generations.gg.generations.core.generationscore.client.GenerationsCoreClient;
import net.minecraft.client.Minecraft;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.common.ForgeConfig;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;

import java.util.function.Consumer;

/**
* This class is used to initialize the Forge client side of the mod.
* @see ClientLifecycleEvent#CLIENT_SETUP
* @see FMLClientSetupEvent
* @see GenerationsCoreClient
* @author J.T. McQuigg, WaterPicker
*/
Expand All @@ -26,11 +27,12 @@ public static void init(IEventBus eventBus) {
GenerationsCoreClient.registerEntityRenderers(event::registerEntityRenderer);
});
eventBus.addListener((Consumer<EntityRenderersEvent.RegisterLayerDefinitions>) event -> GenerationsCoreClient.registerLayerDefinitions(event::registerLayerDefinition));
eventBus.addListener(GenerationsCoreClientForge::forgeClientSetup);
}

ClientLifecycleEvent.CLIENT_SETUP.register(minecraft -> {
GenerationsCoreClient.onInitialize(minecraft);
ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.set(true); // Performance improvement
ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.set(true); // Use Experimental Forge Light Pipeline
});
private static void forgeClientSetup(final FMLClientSetupEvent event) {
GenerationsCoreClient.onInitialize(Minecraft.getInstance());
ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.set(true); // Performance improvement
ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.set(true); // Use Experimental Forge Light Pipeline
}
}
3 changes: 1 addition & 2 deletions forge/src/main/resources/META-INF/mods.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Contains Blocks, Items, Entities, and other things that are used by all other Ge
[[dependencies.generations_core]]
modId="architectury"
mandatory=true
versionRange="[9.1.11,)"
versionRange="[9.1.12,)"
ordering="BEFORE"
side="BOTH"

8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ archives_base_name=Generations-Core
mod_version=2.1-Alpha-SNAPSHOT
maven_group=generations.gg.generations.core

architectury_version=9.1.11
botarium_version=2.1.2
architectury_version=9.1.12
botarium_version=2.2.0
devauth_version=1.1.2
cobblemon_version=1.4.0+1.20.1-SNAPSHOT

fabric_loader_version=0.14.21
fabric_api_version=0.86.0
fabric_api_version=0.86.1

forge_version=47.1.43

parchment=2023.07.23
parchment=2023.07.30

badPackets=0.4.1
WTHIT=8.2.0
Expand Down