Skip to content

优化下代码 #38

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

Open
lostmyself8 wants to merge 1 commit into
base: module-refactor
Choose a base branch
from
Open

优化下代码 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions ...a/committee/nova/mods/avaritia_integration/module/mekanism/common/MekIntegrationLang.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
package committee.nova.mods.avaritia_integration.module.mekanism.common;

import mekanism.common.MekanismLang;
import committee.nova.mods.avaritia_integration.AvaritiaIntegration;
import mekanism.api.annotations.NothingNullByDefault;
import mekanism.api.text.ILangEntry;
import net.minecraft.Util;

public class MekIntegrationLang {
public static MekanismLang NEUTRON_COLLECTING;
public static MekanismLang DESCRIPTION_NEUTRON_COLLECTING;
public static MekanismLang NEUTRON_COMPRESSING;
public static MekanismLang DESCRIPTION_SINGULARITY_COMPRESSING;
@NothingNullByDefault
public enum MekIntegrationLang implements ILangEntry {
NEUTRON_COLLECTING("factory", "neutron_collecting"),
DESCRIPTION_NEUTRON_COLLECTING("description", "neutron_collecting"),
NEUTRON_COMPRESSING("factory", "singularity_compressing"),
DESCRIPTION_SINGULARITY_COMPRESSING("description", "singularity_compressing");

private final String key;

MekIntegrationLang(String type, String path) {
this(Util.makeDescriptionId(type, AvaritiaIntegration.rl(path)));
}

MekIntegrationLang(String key) {
this.key = key;
}

@Override
public String getTranslationKey() {
return key;
}
}
5 changes: 3 additions & 2 deletions ...ia_integration/module/mekanism/common/content/blocktype/MekIntegrationFactoryMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import committee.nova.mods.avaritia_integration.module.mekanism.common.block.attribute.AttributeMekIntegrationFactoryType;
import committee.nova.mods.avaritia_integration.module.mekanism.common.registries.MekIntegrationBlocks;
import mekanism.api.text.ILangEntry;
import mekanism.common.MekanismLang;
import mekanism.common.block.attribute.AttributeUpgradeable;
import mekanism.common.content.blocktype.Machine;
Expand All @@ -14,7 +15,7 @@

public class MekIntegrationFactoryMachine<TILE extends TileEntityMekanism> extends Machine<TILE> {

public MekIntegrationFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, MekanismLang description, MekIntegrationFactoryType factoryType) {
public MekIntegrationFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar, ILangEntry description, MekIntegrationFactoryType factoryType) {
super(tileEntityRegistrar, description);
add(new AttributeMekIntegrationFactoryType(factoryType), new AttributeUpgradeable(() -> MekIntegrationBlocks.getMekIntegrationFactory(FactoryTier.BASIC, getMekIntegrationFactoryType())));
}
Expand All @@ -34,7 +35,7 @@ protected MekIntegrationMachineBuilder(MACHINE holder) {
}

public static <TILE extends TileEntityMekanism> MekIntegrationMachineBuilder<MekIntegrationFactoryMachine<TILE>, TILE, ?> createMekIntegrationFactoryMachine(Supplier<TileEntityTypeRegistryObject<TILE>> tileEntityRegistrar,
MekanismLang description, MekIntegrationFactoryType factoryType) {
ILangEntry description, MekIntegrationFactoryType factoryType) {
return new MekIntegrationMachineBuilder<>(new MekIntegrationFactoryMachine<>(tileEntityRegistrar, description, factoryType));
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ritia_integration/module/mekanism/common/content/blocktype/MekIntegrationFactoryType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import committee.nova.mods.avaritia_integration.module.mekanism.common.registries.MekIntegrationBlocks;
import mekanism.api.annotations.NothingNullByDefault;
import mekanism.api.text.IHasTranslationKey;
import mekanism.common.MekanismLang;
import mekanism.api.text.ILangEntry;
import mekanism.common.registration.impl.BlockRegistryObject;

import java.util.Locale;
Expand All @@ -17,11 +17,11 @@ public enum MekIntegrationFactoryType implements IHasTranslationKey {
SINGULARITY_COMPRESSING("singularity_compressing", MekIntegrationLang.NEUTRON_COMPRESSING, () -> MekIntegrationBlockTypes.SINGULARITY_COMPRESSOR, () -> MekIntegrationBlocks.SINGULARITY_COMPRESSOR);

private final String registryNameComponent;
private final MekanismLang langEntry;
private final ILangEntry langEntry;
private final Supplier<MekIntegrationFactoryMachine<?>> baseMachine;
private final Supplier<BlockRegistryObject<?, ?>> baseBlock;

MekIntegrationFactoryType(String registryNameComponent, MekanismLang langEntry, Supplier<MekIntegrationFactoryMachine<?>> baseMachine, Supplier<BlockRegistryObject<?, ?>> baseBlock) {
MekIntegrationFactoryType(String registryNameComponent, ILangEntry langEntry, Supplier<MekIntegrationFactoryMachine<?>> baseMachine, Supplier<BlockRegistryObject<?, ?>> baseBlock) {
this.registryNameComponent = registryNameComponent;
this.langEntry = langEntry;
this.baseMachine = baseMachine;
Expand Down
Loading