Skip to content

update to 1.13.2 #2

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
temp1011 wants to merge 2 commits into
base: 1.13-pre
Choose a base branch
from
Open

update to 1.13.2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
358a85e
update to 1.13
temp1011 Mar 28, 2019
c137c4a
fix type checking
temp1011 Mar 28, 2019
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
7 changes: 4 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

mcversion=1.13
forgeversion=24.0.84-1.13-pre
forgegroup=net.minecraftforge.test
mcversion=1.13.2
forgeversion=25.0.85
forgegroup=net.minecraftforge
mcp_mappings=20180921-1.13

version_major=1
Expand Down
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
16 changes: 8 additions & 8 deletions src/api/java/genetics/api/DummyApiInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.util.Map;
import java.util.Optional;

import net.minecraftforge.fml.ModThreadContext;
import net.minecraftforge.fml.ModLoadingContext;

import genetics.api.alleles.IAlleleHelper;
import genetics.api.alleles.IAlleleRegistry;
Expand All @@ -21,37 +21,37 @@ public class DummyApiInstance implements IGeneticApiInstance {

@Override
public IClassificationRegistry getClassificationRegistry() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IAlleleRegistry getAlleleRegistry() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IAlleleHelper getAlleleHelper() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IGeneticFactory getGeneticFactory() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IGeneticSaveHandler getSaveHandler() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IIndividualRootHelper getRootHelper() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
public IRootComponentRegistry getComponentRegistry() {
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModThreadContext.get().getActiveContainer()));
throw new IllegalStateException(String.format(ERROR_MESSAGE, ModLoadingContext.get().getActiveContainer()));
}

@Override
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/genetics/Genetics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
import net.minecraftforge.common.capabilities.CapabilityManager;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;

import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

import genetics.api.GeneticsAPI;
import genetics.api.IGeneTemplate;
Expand Down Expand Up @@ -44,8 +44,8 @@ public class Genetics {

public Genetics() {
GeneticsAPI.apiInstance = ApiInstance.INSTANCE;
FMLModLoadingContext.get().getModEventBus().addListener(this::preInit);
FMLModLoadingContext.get().getModEventBus().addListener(this::loadComplete);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::preInit);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete);
}

public void preInit(FMLCommonSetupEvent event) {
Expand Down Expand Up @@ -87,8 +87,8 @@ public Optional<IAllele> getAlleleDirectly(IChromosomeType type, boolean active)

@Nonnull
@Override
public <T> OptionalCapabilityInstance<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return OptionalCapabilityInstance.empty();
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return LazyOptional.empty();
}
});
CapabilityManager.INSTANCE.register(IGeneTemplate.class, new NullStorage<>(), () -> new IGeneTemplate() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/genetics/alleles/AlleleRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.RegistryBuilder;

import net.minecraftforge.fml.ModThreadContext;
import net.minecraftforge.fml.ModLoadingContext;

import genetics.api.alleles.Allele;
import genetics.api.alleles.AlleleCategorized;
Expand Down Expand Up @@ -74,7 +74,7 @@ public IAlleleRegistry addValidAlleleTypes(ResourceLocation registryName, IChrom

@Override
public <V> IAlleleValue<V> registerAllele(String category, String valueName, V value, boolean dominant, IChromosomeType... types) {
return registerAllele(new AlleleCategorized<>(ModThreadContext.get().getActiveContainer().getModId(), category, valueName, value, dominant), types);
return registerAllele(new AlleleCategorized<>(ModLoadingContext.get().getActiveContainer().getModId(), category, valueName, value, dominant), types);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/genetics/items/GeneTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilitySerializable;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;

import genetics.api.IGeneTemplate;
import genetics.api.alleles.IAllele;
Expand All @@ -18,13 +17,14 @@

import genetics.ApiInstance;
import genetics.Genetics;
import net.minecraftforge.common.util.LazyOptional;

public class GeneTemplate implements IGeneTemplate, ICapabilitySerializable<NBTTagCompound> {
private static final String ALLELE_NBT_KEY = "Allele";
private static final String TYPE_NBT_KEY = "Type";
private static final String DEFINITION_NBT_KEY = "Definition";

private final OptionalCapabilityInstance<IGeneTemplate> holder = OptionalCapabilityInstance.of(() -> this);
private final LazyOptional<IGeneTemplate> holder = LazyOptional.of(() -> this);

@Nullable
private IAllele allele;
Expand Down Expand Up @@ -86,7 +86,7 @@ public void deserializeNBT(NBTTagCompound compound) {
}

@Override
public <T> OptionalCapabilityInstance<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return OptionalCapabilityInstance.orEmpty(cap, Genetics.GENE_TEMPLATE, holder);
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return Genetics.GENE_TEMPLATE.orEmpty(cap, holder);
}
}
8 changes: 4 additions & 4 deletions src/main/java/genetics/organism/Organism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.minecraft.util.EnumFacing;

import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.OptionalCapabilityInstance;

import genetics.api.alleles.IAllele;
import genetics.api.individual.IChromosomeType;
Expand All @@ -21,9 +20,10 @@

import genetics.Genetics;
import genetics.individual.GeneticSaveHandler;
import net.minecraftforge.common.util.LazyOptional;

public class Organism<I extends IIndividual> implements IOrganism<I> {
private final OptionalCapabilityInstance<IOrganism> holder = OptionalCapabilityInstance.of(() -> this);
private final LazyOptional<IOrganism> holder = LazyOptional.of(() -> this);
private final ItemStack container;
private final IRootDefinition<? extends IIndividualRoot<I>> definition;
private final Supplier<IOrganismType> typeSupplier;
Expand Down Expand Up @@ -74,7 +74,7 @@ public Optional<IAllele> getAlleleDirectly(IChromosomeType type, boolean active)
}

@Override
public <T> OptionalCapabilityInstance<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return OptionalCapabilityInstance.orEmpty(cap, Genetics.ORGANISM, holder);
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing facing) {
return Genetics.ORGANISM.orEmpty(cap, holder);
}
}
10 changes: 6 additions & 4 deletions src/main/java/genetics/plugins/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import net.minecraftforge.eventbus.api.EventPriority;

import net.minecraftforge.fml.ModContainer;
import net.minecraftforge.fml.ModThreadContext;
import net.minecraftforge.fml.ModLoadingContext;

import genetics.api.GeneticPlugin;
import genetics.api.GeneticsAPI;
Expand Down Expand Up @@ -67,11 +67,13 @@ public static void initPlugins() {
}

private static void handlePlugins(Consumer<IGeneticPlugin> pluginConsumer) {
ModContainer oldContainer = ModThreadContext.get().getActiveContainer();
ModLoadingContext context = ModLoadingContext.get();
ModContainer oldContainer = context.getActiveContainer();
Object languageExtension = context.extension();
plugins.forEach((plugin, container) -> {
ModThreadContext.get().setActiveContainer(container);
ModLoadingContext.get().setActiveContainer(container, languageExtension);
pluginConsumer.accept(plugin);
});
ModThreadContext.get().setActiveContainer(oldContainer);
ModLoadingContext.get().setActiveContainer(oldContainer, languageExtension);
}
}
4 changes: 3 additions & 1 deletion src/main/java/genetics/plugins/PluginUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;

import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -34,7 +36,7 @@ public static Map<IGeneticPlugin, ModContainer> getPlugins() {
Function<String, Optional<? extends ModContainer>> getContainer = (modId)->ModList.get().getModContainerById(modId);
List<String> pluginClassNames = new ArrayList<>();
for (ModFileScanData scanData : allScanData) {
List<ModFileScanData.AnnotationData> annotations = scanData.getAnnotations();
Set<AnnotationData> annotations = scanData.getAnnotations();
for (ModFileScanData.AnnotationData a : annotations) {
if (Objects.equals(a.getAnnotationType(), annotationType)) {
String memberName = a.getMemberName();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/genetics/root/MutationContainerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import genetics.api.individual.IIndividual;
import genetics.api.mutation.IMutation;
import genetics.api.mutation.IMutationContainer;
import genetics.api.mutation.IMutationContainerBuilder;
import genetics.api.mutation.IMutationRegistry;
import genetics.api.root.IIndividualRoot;
import genetics.api.root.components.RootComponentBuilder;

public class MutationContainerBuilder<I extends IIndividual, M extends IMutation> extends RootComponentBuilder<IMutationContainer<M>, I> implements IMutationContainerBuilder<M> {
public class MutationContainerBuilder<I extends IIndividual, M extends IMutation> extends RootComponentBuilder<IMutationContainer<M>, I> implements IMutationRegistry<M> {
private final ImmutableList.Builder<M> mutations;

public MutationContainerBuilder(IIndividualRoot<I> root) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mariculture/Mariculture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLModLoadingContext;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;

import genetics.api.GeneticsAPI;

Expand All @@ -13,7 +13,7 @@ public class Mariculture {

public Mariculture() {
GeneticsAPI.apiInstance = ApiInstance.INSTANCE;
FMLModLoadingContext.get().getModEventBus().addListener(this::preInit);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::preInit);
}

public void preInit(FMLCommonSetupEvent event) {
Expand Down