dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add API delivery

Browse Source
This commit is contained in:
raoulvdberge
2019-10-29 15:59:34 +01:00
parent 2c5ca32ae5
commit deda011b98
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -88,6 +88,8 @@ public final class RS {
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, this::onRegisterItems); FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, this::onRegisterItems);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(IRecipeSerializer.class, this::onRegisterRecipeSerializers); FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(IRecipeSerializer.class, this::onRegisterRecipeSerializers);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(ContainerType.class, this::onRegisterContainers); FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(ContainerType.class, this::onRegisterContainers);
API.deliver();
} }
@SubscribeEvent @SubscribeEvent

38
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
View File

@@ -1,6 +1,7 @@
package com.raoulvdberge.refinedstorage.apiimpl; package com.raoulvdberge.refinedstorage.apiimpl;
import com.raoulvdberge.refinedstorage.api.IRSAPI; import com.raoulvdberge.refinedstorage.api.IRSAPI;
import com.raoulvdberge.refinedstorage.api.RSAPIInject;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternRenderHandler;
import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementList;
import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry; import com.raoulvdberge.refinedstorage.api.autocrafting.craftingmonitor.ICraftingMonitorElementRegistry;
@@ -45,11 +46,20 @@ import net.minecraft.nbt.ListNBT;
import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionType;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.forgespi.language.ModFileScanData;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.objectweb.asm.Type;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.lang.reflect.Field;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
public class API implements IRSAPI { public class API implements IRSAPI {
private static final Logger LOGGER = LogManager.getLogger(API.class);
private static final IRSAPI INSTANCE = new API(); private static final IRSAPI INSTANCE = new API();
private final IComparer comparer = new Comparer(); private final IComparer comparer = new Comparer();
@@ -69,24 +79,32 @@ public class API implements IRSAPI {
return INSTANCE; return INSTANCE;
} }
/* TODO API DELIVERY public static void deliver(ASMDataTable asmDataTable) { public static void deliver() {
String annotationClassName = RSAPIInject.class.getCanonicalName(); Type annotationType = Type.getType(RSAPIInject.class);
Set<ASMDataTable.ASMData> asmDataSet = asmDataTable.getAll(annotationClassName); List<ModFileScanData.AnnotationData> annotations = ModList.get().getAllScanData().stream()
.map(ModFileScanData::getAnnotations)
.flatMap(Collection::stream)
.filter(a -> annotationType.equals(a.getAnnotationType()))
.collect(Collectors.toList());
for (ASMDataTable.ASMData asmData : asmDataSet) { LOGGER.info("Found {} RS API injection {}", annotations.size(), annotations.size() == 1 ? "point" : "points");
for (ModFileScanData.AnnotationData annotation : annotations) {
try { try {
Class clazz = Class.forName(asmData.getClassName()); Class clazz = Class.forName(annotation.getClassType().getClassName());
Field field = clazz.getField(asmData.getObjectName()); Field field = clazz.getField(annotation.getMemberName());
if (field.getType() == IRSAPI.class) { if (field.getType() == IRSAPI.class) {
field.set(null, INSTANCE); field.set(null, INSTANCE);
} }
} catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException("Failed to set: {}" + asmData.getClassName() + "." + asmData.getObjectName(), e); LOGGER.info("Injected RS API in {} {}", annotation.getClassType().getClassName(), annotation.getMemberName());
} catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException | NoSuchFieldException | SecurityException e) {
LOGGER.error("Could not inject RS API in {} {}", annotation.getClassType().getClassName(), annotation.getMemberName(), e);
} }
} }
}*/ }
@Nonnull @Nonnull
@Override @Override
@@ -216,7 +234,7 @@ public class API implements IRSAPI {
if (world == null) { if (world == null) {
throw new IllegalArgumentException("World cannot be null"); throw new IllegalArgumentException("World cannot be null");
} }
return new FluidStorageDisk(world, capacity); return new FluidStorageDisk(world, capacity);
} }

2
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

@@ -5,8 +5,6 @@ public class ProxyCommon {
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
API.deliver(e.getAsmData());
IntegrationInventorySorter.register(); IntegrationInventorySorter.register();
} }