Browse Source

YNot 0.2.4

master
asie 6 months ago
parent
commit
308daad6b1

+ 5
- 5
build.gradle View File

@@ -22,7 +22,7 @@ apply plugin: 'net.minecrell.licenser'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
version = "0.2.3"
version = "0.2.4"
group = "pl.asie.ynot"
archivesBaseName = "YNot"
@@ -38,7 +38,7 @@ dependencies {
}
minecraft {
version = "1.12.2-14.23.4.2708"
version = "1.12.2-14.23.5.2836"
runDir = "run"
useDepAts = true
@@ -78,11 +78,11 @@ license {
}
dependencies {
deobfCompile "com.github.mcjty:xnet:1.12-1.7.0"
deobfCompile "com.github.mcjty:mcjtylib:1.12-3.0.1"
deobfCompile "com.github.mcjty:xnet:1.12-1.8.0"
deobfCompile "com.github.mcjty:mcjtylib:1.12-3.5.1"
deobfCompile "li.cil.oc:OpenComputers:MC1.12-1.7.+:api"
deobfCompile "li.cil.tis3d:TIS-3D:MC1.12-1.3.+:api"
deobfCompile name: "Mekanism", version: "1.12.2-9.4.2.328"
deobfCompile name: "Mekanism", version: "1.12.2-9.7.4.375"
deobfCompile name: "Flamingo", version: "1.12-v1.11"
}

+ 1
- 1
src/main/java/pl/asie/ynot/YNot.java View File

@@ -57,7 +57,7 @@ import java.util.function.Function;
modid = "ynot",
name = "YNot",
version = "@VERSION@",
dependencies = "required-after:xnet@[1.6.6,)",
dependencies = "required-after:xnet@[1.8.0,)",
updateJSON = "http://asie.pl/files/minecraft/update/ynot.json"
)
public class YNot {

+ 3
- 3
src/main/java/pl/asie/ynot/YNotConnectable.java View File

@@ -36,21 +36,21 @@ import java.util.*;

public class YNotConnectable implements IConnectable {
protected static final YNotConnectable INSTANCE = new YNotConnectable();
private final List<Class> classes = new ArrayList<>();
private final List<Class<?>> classes = new ArrayList<>();
private final List<Capability> caps = new ArrayList<>();

public static void add(Capability... c) {
INSTANCE.caps.addAll(Arrays.asList(c));
}

public static void add(Class... c) {
public static void add(Class<?>... c) {
INSTANCE.classes.addAll(Arrays.asList(c));
}

@Override
public ConnectResult canConnect(@Nonnull IBlockAccess access, @Nonnull BlockPos connectorPos, @Nonnull BlockPos blockPos, @Nullable TileEntity tile, @Nonnull EnumFacing facing) {
if (tile != null) {
for (Class c : classes) {
for (Class<?> c : classes) {
if (c.isAssignableFrom(tile.getClass())) {
return ConnectResult.YES;
}

+ 2
- 2
src/main/java/pl/asie/ynot/mekanism/GasChannelSettings.java View File

@@ -26,7 +26,7 @@ import mcjty.xnet.api.gui.IEditorGui;
import mcjty.xnet.api.gui.IndicatorIcon;
import mcjty.xnet.api.keys.SidedConsumer;
import mcjty.xnet.blocks.controller.gui.GuiController;
import mcjty.xnet.config.GeneralConfiguration;
import mcjty.xnet.config.ConfigSetup;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasHandler;
import net.minecraft.nbt.NBTTagCompound;
@@ -129,7 +129,7 @@ public class GasChannelSettings extends TraitedChannelSettings {
List<Triple<SidedConsumer, GasConnectorSettings, Integer>> inserted = new ArrayList<>();
int remaining = insertGasSimulate(inserted, context, gas);
if (!inserted.isEmpty()) {
if (context.checkAndConsumeRF(GeneralConfiguration.controllerOperationRFT)) {
if (context.checkAndConsumeRF(ConfigSetup.controllerOperationRFT.get())) {
gas = handler.drawGas(settings.getFacing(), gas.amount - remaining, true);
insertGasReal(context, inserted, gas);
}

+ 0
- 1
src/main/java/pl/asie/ynot/mekanism/GasConnectorSettings.java View File

@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSet;
import mcjty.xnet.api.gui.IEditorGui;
import mcjty.xnet.api.gui.IndicatorIcon;
import mcjty.xnet.blocks.controller.gui.GuiController;
import mcjty.xnet.config.GeneralConfiguration;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasItem;
import net.minecraft.item.ItemStack;

Loading…
Cancel
Save