mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 12:42:53 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef4dd3710a | ||
|
|
190693ad68 | ||
|
|
3dc2806b36 | ||
|
|
a609f5dce5 | ||
|
|
00c214ee5d | ||
|
|
e497b9505a | ||
|
|
b5ac446e55 | ||
|
|
c00e1b39da |
No files matched your search
+7
-1
@@ -26,7 +26,13 @@ whitelist.json
|
|||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
*.iws
|
*.iws
|
||||||
src/main/resources/mixins.*.json
|
src/main/resources/mixins.*([!.]).json
|
||||||
*.bat
|
*.bat
|
||||||
*.DS_Store
|
*.DS_Store
|
||||||
!gradlew.bat
|
!gradlew.bat
|
||||||
|
.factorypath
|
||||||
|
addon.local.gradle
|
||||||
|
addon.local.gradle.kts
|
||||||
|
addon.late.local.gradle
|
||||||
|
addon.late.local.gradle.kts
|
||||||
|
layout.json
|
||||||
+60
-44
@@ -1,4 +1,4 @@
|
|||||||
//version: 1691351470
|
//version: 1702141377
|
||||||
/*
|
/*
|
||||||
DO NOT CHANGE THIS FILE!
|
DO NOT CHANGE THIS FILE!
|
||||||
Also, you may replace this file at any time if there is an update available.
|
Also, you may replace this file at any time if there is an update available.
|
||||||
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
|
||||||
|
|
||||||
maven {
|
|
||||||
name 'forge'
|
|
||||||
url 'https://maven.minecraftforge.net'
|
|
||||||
}
|
|
||||||
maven {
|
maven {
|
||||||
// GTNH RetroFuturaGradle and ASM Fork
|
// GTNH RetroFuturaGradle and ASM Fork
|
||||||
name "GTNH Maven"
|
name "GTNH Maven"
|
||||||
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
||||||
allowInsecureProtocol = true
|
allowInsecureProtocol = true
|
||||||
}
|
}
|
||||||
maven {
|
|
||||||
name 'sonatype'
|
|
||||||
url 'https://oss.sonatype.org/content/repositories/snapshots/'
|
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name 'Scala CI dependencies'
|
|
||||||
url 'https://repo1.maven.org/maven2/'
|
|
||||||
}
|
|
||||||
|
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,7 +54,7 @@ plugins {
|
|||||||
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
|
id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version
|
||||||
id 'com.modrinth.minotaur' version '2.+' apply false
|
id 'com.modrinth.minotaur' version '2.+' apply false
|
||||||
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
|
||||||
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24'
|
id 'com.gtnewhorizons.retrofuturagradle' version '1.3.26'
|
||||||
}
|
}
|
||||||
|
|
||||||
print("You might want to check out './gradlew :faq' if your build fails.\n")
|
print("You might want to check out './gradlew :faq' if your build fails.\n")
|
||||||
@@ -89,6 +74,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output')
|
|||||||
def projectJavaVersion = JavaLanguageVersion.of(8)
|
def projectJavaVersion = JavaLanguageVersion.of(8)
|
||||||
|
|
||||||
boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
|
boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
|
||||||
|
boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false
|
||||||
|
|
||||||
|
final String CHECKSTYLE_CONFIG = """
|
||||||
|
<!DOCTYPE module PUBLIC
|
||||||
|
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
|
||||||
|
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
|
||||||
|
<module name="Checker">
|
||||||
|
<module name="TreeWalker">
|
||||||
|
<!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block -->
|
||||||
|
<module name="SuppressionCommentFilter"/>
|
||||||
|
<module name="AvoidStarImport">
|
||||||
|
<!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE -->
|
||||||
|
<property name="allowStaticMemberImports" value="true"/>
|
||||||
|
</module>
|
||||||
|
</module>
|
||||||
|
</module>
|
||||||
|
"""
|
||||||
|
|
||||||
checkPropertyExists("modName")
|
checkPropertyExists("modName")
|
||||||
checkPropertyExists("modId")
|
checkPropertyExists("modId")
|
||||||
@@ -140,6 +142,17 @@ if (!disableSpotless) {
|
|||||||
apply from: Blowdryer.file('spotless.gradle')
|
apply from: Blowdryer.file('spotless.gradle')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!disableCheckstyle) {
|
||||||
|
apply plugin: 'checkstyle'
|
||||||
|
tasks.named("checkstylePatchedMc") { enabled = false }
|
||||||
|
tasks.named("checkstyleMcLauncher") { enabled = false }
|
||||||
|
tasks.named("checkstyleIdeVirtualMain") { enabled = false }
|
||||||
|
tasks.named("checkstyleInjectedTags") { enabled = false }
|
||||||
|
checkstyle {
|
||||||
|
config = resources.text.fromString(CHECKSTYLE_CONFIG)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
String javaSourceDir = "src/main/java/"
|
String javaSourceDir = "src/main/java/"
|
||||||
String scalaSourceDir = "src/main/scala/"
|
String scalaSourceDir = "src/main/scala/"
|
||||||
String kotlinSourceDir = "src/main/kotlin/"
|
String kotlinSourceDir = "src/main/kotlin/"
|
||||||
@@ -274,7 +287,7 @@ if (apiPackage) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (accessTransformersFile) {
|
if (accessTransformersFile) {
|
||||||
for (atFile in accessTransformersFile.split(",")) {
|
for (atFile in accessTransformersFile.split(" ")) {
|
||||||
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
|
||||||
if (!getFile(targetFile).exists()) {
|
if (!getFile(targetFile).exists()) {
|
||||||
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
|
||||||
@@ -562,9 +575,6 @@ repositories {
|
|||||||
maven {
|
maven {
|
||||||
name 'Overmind forge repo mirror'
|
name 'Overmind forge repo mirror'
|
||||||
url 'https://gregtech.overminddl1.com/'
|
url 'https://gregtech.overminddl1.com/'
|
||||||
mavenContent {
|
|
||||||
excludeGroup("net.minecraftforge") // missing the `universal` artefact
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "GTNH Maven"
|
name = "GTNH Maven"
|
||||||
@@ -603,15 +613,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
maven {
|
maven {
|
||||||
name = "ic2"
|
name = "ic2"
|
||||||
url = "https://maven.ic2.player.to/"
|
url = getURL("https://maven2.ic2.player.to/", "https://maven.ic2.player.to/")
|
||||||
metadataSources {
|
content {
|
||||||
mavenPom()
|
includeGroup "net.industrial-craft"
|
||||||
artifact()
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
maven {
|
|
||||||
name = "ic2-mirror"
|
|
||||||
url = "https://maven2.ic2.player.to/"
|
|
||||||
metadataSources {
|
metadataSources {
|
||||||
mavenPom()
|
mavenPom()
|
||||||
artifact()
|
artifact()
|
||||||
@@ -626,7 +631,7 @@ repositories {
|
|||||||
|
|
||||||
def mixinProviderGroup = "io.github.legacymoddingmc"
|
def mixinProviderGroup = "io.github.legacymoddingmc"
|
||||||
def mixinProviderModule = "unimixins"
|
def mixinProviderModule = "unimixins"
|
||||||
def mixinProviderVersion = "0.1.7.1"
|
def mixinProviderVersion = "0.1.13"
|
||||||
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
|
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
|
||||||
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
|
||||||
ext.mixinProviderSpec = mixinProviderSpec
|
ext.mixinProviderSpec = mixinProviderSpec
|
||||||
@@ -667,6 +672,8 @@ configurations.all {
|
|||||||
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||||
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods")
|
||||||
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier")
|
||||||
|
|
||||||
|
substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -773,23 +780,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
def lwjgl3ifyVersion = '1.4.0'
|
def lwjgl3ifyVersion = '1.5.7'
|
||||||
def asmVersion = '9.4'
|
|
||||||
if (modId != 'lwjgl3ify') {
|
if (modId != 'lwjgl3ify') {
|
||||||
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
||||||
}
|
}
|
||||||
if (modId != 'hodgepodge') {
|
if (modId != 'hodgepodge') {
|
||||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
|
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
|
||||||
}
|
}
|
||||||
|
|
||||||
java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
|
|
||||||
java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
|
|
||||||
java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
|
|
||||||
java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
|
|
||||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1176,9 +1174,8 @@ publishing {
|
|||||||
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
if (usesMavenPublishing.toBoolean()) {
|
if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
|
||||||
maven {
|
maven {
|
||||||
url = mavenPublishUrl
|
url = mavenPublishUrl
|
||||||
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
|
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
|
||||||
@@ -1300,7 +1297,7 @@ def addCurseForgeRelation(String type, String name) {
|
|||||||
|
|
||||||
// Updating
|
// Updating
|
||||||
|
|
||||||
def buildscriptGradleVersion = "8.2.1"
|
def buildscriptGradleVersion = "8.5"
|
||||||
|
|
||||||
tasks.named('wrapper', Wrapper).configure {
|
tasks.named('wrapper', Wrapper).configure {
|
||||||
gradleVersion = buildscriptGradleVersion
|
gradleVersion = buildscriptGradleVersion
|
||||||
@@ -1579,6 +1576,25 @@ def getSecondaryArtifacts() {
|
|||||||
return secondaryArtifacts
|
return secondaryArtifacts
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def getURL(String main, String fallback) {
|
||||||
|
return pingURL(main, 10000) ? main : fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
// credit: https://stackoverflow.com/a/3584332
|
||||||
|
def pingURL(String url, int timeout) {
|
||||||
|
url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates.
|
||||||
|
try {
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection()
|
||||||
|
connection.setConnectTimeout(timeout)
|
||||||
|
connection.setReadTimeout(timeout)
|
||||||
|
connection.setRequestMethod("HEAD")
|
||||||
|
int responseCode = connection.getResponseCode()
|
||||||
|
return 200 <= responseCode && responseCode <= 399
|
||||||
|
} catch (IOException ignored) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// For easier scripting of things that require variables defined earlier in the buildscript
|
// For easier scripting of things that require variables defined earlier in the buildscript
|
||||||
if (file('addon.late.gradle.kts').exists()) {
|
if (file('addon.late.gradle.kts').exists()) {
|
||||||
apply from: 'addon.late.gradle.kts'
|
apply from: 'addon.late.gradle.kts'
|
||||||
|
|||||||
+4
-3
@@ -1,11 +1,12 @@
|
|||||||
// Add your dependencies here
|
// Add your dependencies here
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
|
api('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
|
||||||
implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
|
implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
|
||||||
|
|
||||||
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.3.81-GTNH:dev')
|
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev')
|
||||||
|
|
||||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api')
|
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.37:api')
|
||||||
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
|
||||||
|
compileOnly("curse.maven:extrabiomesxl-60041:2273301")
|
||||||
}
|
}
|
||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -130,10 +130,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ public enum EnumFlowerColor implements IFlowerColor {
|
|||||||
YELLOW("yellow", 0xffff00),
|
YELLOW("yellow", 0xffff00),
|
||||||
YELLOW_GREEN("yellowGreen", 0x9acd32);
|
YELLOW_GREEN("yellowGreen", 0x9acd32);
|
||||||
|
|
||||||
|
private static final EnumFlowerColor[] ALL_VALUES = values();
|
||||||
private int color;
|
private int color;
|
||||||
private int colorDis;
|
private int colorDis;
|
||||||
private String name;
|
private String name;
|
||||||
@@ -2963,7 +2964,7 @@ public enum EnumFlowerColor implements IFlowerColor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static EnumFlowerColor get(int i) {
|
public static EnumFlowerColor get(int i) {
|
||||||
return values()[Math.max(0, i) % values().length];
|
return ALL_VALUES[Math.max(0, i) % ALL_VALUES.length];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public class Mods {
|
|||||||
public static Mod forestry;
|
public static Mod forestry;
|
||||||
public static Mod ic2;
|
public static Mod ic2;
|
||||||
public static Mod botania;
|
public static Mod botania;
|
||||||
|
public static Mod extraBiomes;
|
||||||
|
|
||||||
private static Item findItem(String modId, String name) {
|
private static Item findItem(String modId, String name) {
|
||||||
Item stack = GameRegistry.findItem(modId, name);
|
Item stack = GameRegistry.findItem(modId, name);
|
||||||
@@ -41,6 +42,7 @@ public class Mods {
|
|||||||
Mods.forestry = new Mod("Forestry");
|
Mods.forestry = new Mod("Forestry");
|
||||||
Mods.ic2 = new Mod("IC2");
|
Mods.ic2 = new Mod("IC2");
|
||||||
Mods.botania = new Mod("Botania");
|
Mods.botania = new Mod("Botania");
|
||||||
|
Mods.extraBiomes = new Mod("ExtrabiomesXL");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Mod {
|
public static class Mod {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import net.minecraft.client.renderer.OpenGlHelper;
|
|||||||
import net.minecraft.client.renderer.RenderHelper;
|
import net.minecraft.client.renderer.RenderHelper;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
import net.minecraft.inventory.Slot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.JsonToNBT;
|
import net.minecraft.nbt.JsonToNBT;
|
||||||
import net.minecraft.nbt.NBTException;
|
import net.minecraft.nbt.NBTException;
|
||||||
@@ -30,6 +31,8 @@ import binnie.core.craftgui.events.EventMouse;
|
|||||||
import binnie.core.craftgui.geometry.IArea;
|
import binnie.core.craftgui.geometry.IArea;
|
||||||
import binnie.core.craftgui.geometry.IBorder;
|
import binnie.core.craftgui.geometry.IBorder;
|
||||||
import binnie.core.craftgui.geometry.IPoint;
|
import binnie.core.craftgui.geometry.IPoint;
|
||||||
|
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||||
|
import binnie.core.nei.NEIHook;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
@@ -76,6 +79,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void drawScreen(int mouseX, int mouseY, float par3) {
|
public void drawScreen(int mouseX, int mouseY, float par3) {
|
||||||
|
NEIHook.preDraw();
|
||||||
|
|
||||||
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
|
window.setMousePosition(mouseX - (int) window.getPosition().x(), mouseY - (int) window.getPosition().y());
|
||||||
drawDefaultBackground();
|
drawDefaultBackground();
|
||||||
|
|
||||||
@@ -89,6 +94,9 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
window.render();
|
window.render();
|
||||||
|
|
||||||
RenderHelper.enableGUIStandardItemLighting();
|
RenderHelper.enableGUIStandardItemLighting();
|
||||||
|
|
||||||
|
NEIHook.renderObjects(window, mouseX, mouseY);
|
||||||
|
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
|
GL11.glEnable(32826); // GL_RESCALE_NORMAL_EXT
|
||||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
|
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240.0f, 240.0f);
|
||||||
@@ -113,6 +121,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
if (tooltip.exists()) {
|
if (tooltip.exists()) {
|
||||||
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
renderTooltip(new IPoint(mouseX, mouseY), tooltip);
|
||||||
|
} else {
|
||||||
|
NEIHook.renderToolTips(mouseX, mouseY);
|
||||||
}
|
}
|
||||||
zLevel = 0.0f;
|
zLevel = 0.0f;
|
||||||
GL11.glEnable(GL11.GL_LIGHTING);
|
GL11.glEnable(GL11.GL_LIGHTING);
|
||||||
@@ -219,6 +229,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void mouseClicked(int x, int y, int button) {
|
protected void mouseClicked(int x, int y, int button) {
|
||||||
|
NEIHook.mouseClicked(x, y, button);
|
||||||
|
|
||||||
IWidget origin = window;
|
IWidget origin = window;
|
||||||
if (window.getMousedOverWidget() != null) {
|
if (window.getMousedOverWidget() != null) {
|
||||||
origin = window.getMousedOverWidget();
|
origin = window.getMousedOverWidget();
|
||||||
@@ -228,6 +240,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void keyTyped(char c, int key) {
|
protected void keyTyped(char c, int key) {
|
||||||
|
NEIHook.lastKeyTyped(key, c);
|
||||||
|
|
||||||
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
|
if (key == 1 || (key == mc.gameSettings.keyBindInventory.getKeyCode() && window.getFocusedWidget() == null)) {
|
||||||
mc.thePlayer.closeScreen();
|
mc.thePlayer.closeScreen();
|
||||||
}
|
}
|
||||||
@@ -241,6 +255,7 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
if (button != -1) {
|
if (button != -1) {
|
||||||
window.callEvent(new EventMouse.Up(origin, x, y, button));
|
window.callEvent(new EventMouse.Up(origin, x, y, button));
|
||||||
}
|
}
|
||||||
|
NEIHook.mouseUp(x, y, button);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -250,6 +265,8 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
if (dWheel != 0) {
|
if (dWheel != 0) {
|
||||||
window.callEvent(new EventMouse.Wheel(window, dWheel));
|
window.callEvent(new EventMouse.Wheel(window, dWheel));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NEIHook.handleMouseWheel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -506,4 +523,9 @@ public class GuiCraftGUI extends GuiContainer {
|
|||||||
GL11.glDisable(GL11.GL_BLEND);
|
GL11.glDisable(GL11.GL_BLEND);
|
||||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ItemStack getStackUnderMouse(int x, int y) {
|
||||||
|
return window.calculateMousedOverWidgets().stream().filter(widget -> widget instanceof ControlSlot).findFirst()
|
||||||
|
.map(w -> ((ControlSlot) w).slot).map(Slot::getStack).orElse(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,7 @@ import binnie.core.craftgui.minecraft.control.ControlHelp;
|
|||||||
import binnie.core.craftgui.minecraft.control.ControlInfo;
|
import binnie.core.craftgui.minecraft.control.ControlInfo;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
|
import binnie.core.craftgui.minecraft.control.ControlPowerSystem;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
import binnie.core.craftgui.minecraft.control.ControlSlot;
|
||||||
|
import binnie.core.craftgui.minecraft.control.ControlSlotBase;
|
||||||
import binnie.core.craftgui.minecraft.control.ControlUser;
|
import binnie.core.craftgui.minecraft.control.ControlUser;
|
||||||
import binnie.core.craftgui.minecraft.control.EnumHighlighting;
|
import binnie.core.craftgui.minecraft.control.EnumHighlighting;
|
||||||
import binnie.core.craftgui.renderer.Renderer;
|
import binnie.core.craftgui.renderer.Renderer;
|
||||||
@@ -40,6 +41,7 @@ import binnie.core.machines.Machine;
|
|||||||
import binnie.core.machines.inventory.IInventoryMachine;
|
import binnie.core.machines.inventory.IInventoryMachine;
|
||||||
import binnie.core.machines.network.INetwork;
|
import binnie.core.machines.network.INetwork;
|
||||||
import binnie.core.machines.power.PowerSystem;
|
import binnie.core.machines.power.PowerSystem;
|
||||||
|
import binnie.core.nei.NEIHook;
|
||||||
import binnie.core.network.packet.MessageCraftGUI;
|
import binnie.core.network.packet.MessageCraftGUI;
|
||||||
import binnie.core.resource.BinnieResource;
|
import binnie.core.resource.BinnieResource;
|
||||||
import binnie.core.resource.ResourceType;
|
import binnie.core.resource.ResourceType;
|
||||||
@@ -118,6 +120,9 @@ public abstract class Window extends TopLevelWidget implements INetwork.RecieveG
|
|||||||
if (!widget.calculateIsMouseOver()) {
|
if (!widget.calculateIsMouseOver()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
if (NEIHook.enabled && widget instanceof ControlSlotBase) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (widget instanceof ITooltip) {
|
if (widget instanceof ITooltip) {
|
||||||
((ITooltip) widget).getTooltip(tooltip);
|
((ITooltip) widget).getTooltip(tooltip);
|
||||||
if (tooltip.exists()) {
|
if (tooltip.exists()) {
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
package binnie.core.nei;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import binnie.core.craftgui.minecraft.GuiCraftGUI;
|
||||||
|
import codechicken.nei.guihook.IContainerObjectHandler;
|
||||||
|
import cpw.mods.fml.common.Optional;
|
||||||
|
|
||||||
|
@Optional.Interface(
|
||||||
|
iface = "codechicken.nei.guihook.IContainerObjectHandler",
|
||||||
|
modid = "NotEnoughItems",
|
||||||
|
striprefs = true)
|
||||||
|
public final class ContainerObjectHandler implements IContainerObjectHandler {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void guiTick(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void refresh(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load(GuiContainer gui) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
|
if (gui instanceof GuiCraftGUI) {
|
||||||
|
return ((GuiCraftGUI) gui).getStackUnderMouse(mousex, mousey);
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldShowTooltip(GuiContainer gui) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
package binnie.core.nei;
|
||||||
|
|
||||||
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
import binnie.core.craftgui.minecraft.Window;
|
||||||
|
import codechicken.nei.guihook.GuiContainerManager;
|
||||||
|
import cpw.mods.fml.common.Loader;
|
||||||
|
import cpw.mods.fml.common.Optional;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
|
public final class NEIHook {
|
||||||
|
|
||||||
|
public static boolean enabled = false;
|
||||||
|
|
||||||
|
static {
|
||||||
|
if (Loader.isModLoaded("NotEnoughItems")) {
|
||||||
|
enabled = true;
|
||||||
|
addHandler();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void addHandler() {
|
||||||
|
GuiContainerManager.addObjectHandler(new ContainerObjectHandler());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static GuiContainerManager getManager() {
|
||||||
|
return GuiContainerManager.getManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void preDrawImpl() {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.preDraw();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void preDraw() {
|
||||||
|
if (enabled) preDrawImpl();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void renderObjectsImpl(Window window, int mouseX, int mouseY) {
|
||||||
|
GL11.glPushMatrix();
|
||||||
|
GL11.glTranslatef(window.x(), window.y(), 0.0f);
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.renderObjects(mouseX, mouseY);
|
||||||
|
GL11.glTranslatef(-window.x(), -window.y(), 0.0f);
|
||||||
|
GL11.glPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderObjects(Window window, int mouseX, int mouseY) {
|
||||||
|
if (enabled) renderObjectsImpl(window, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void renderToolTipsImpl(int mouseX, int mouseY) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.renderToolTips(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void renderToolTips(int mouseX, int mouseY) {
|
||||||
|
if (enabled) renderToolTipsImpl(mouseX, mouseY);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void mouseClickedImpl(int x, int y, int button) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.mouseClicked(x, y, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void mouseClicked(int x, int y, int button) {
|
||||||
|
if (enabled) mouseClickedImpl(x, y, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void lastKeyTypedImpl(int k, char c) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.lastKeyTyped(k, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void lastKeyTyped(int k, char c) {
|
||||||
|
if (enabled) lastKeyTypedImpl(k, c);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void handleMouseWheelImpl() {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.handleMouseWheel();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void handleMouseWheel() {
|
||||||
|
if (enabled) handleMouseWheelImpl();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Optional.Method(modid = "NotEnoughItems")
|
||||||
|
private static void mouseUpImpl(int mouseX, int mouseY, int button) {
|
||||||
|
GuiContainerManager manager = getManager();
|
||||||
|
if (manager != null) manager.mouseUp(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void mouseUp(int mouseX, int mouseY, int button) {
|
||||||
|
if (enabled) mouseUpImpl(mouseX, mouseY, button);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,11 @@ package binnie.core.nei;
|
|||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.fluids.*;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
|
import net.minecraftforge.fluids.IFluidBlock;
|
||||||
|
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||||
|
|
||||||
public class NEIUtils {
|
public class NEIUtils {
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Point;
|
||||||
|
import java.awt.Rectangle;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package binnie.core.nei;
|
package binnie.core.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Point;
|
||||||
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ import java.util.ArrayList;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import binnie.extrabees.genetics.requirements.*;
|
import binnie.extrabees.genetics.requirements.DummyMutationCondition;
|
||||||
|
import binnie.extrabees.genetics.requirements.IMutationRequirement;
|
||||||
|
import binnie.extrabees.genetics.requirements.RequirementPerson;
|
||||||
import forestry.api.apiculture.BeeManager;
|
import forestry.api.apiculture.BeeManager;
|
||||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||||
import forestry.api.apiculture.IBeeGenome;
|
import forestry.api.apiculture.IBeeGenome;
|
||||||
|
|||||||
@@ -8,13 +8,12 @@ import net.minecraft.item.ItemBlock;
|
|||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.IIcon;
|
import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
|
||||||
|
|
||||||
import binnie.core.Mods;
|
import binnie.core.Mods;
|
||||||
import binnie.core.block.TileEntityMetadata;
|
import binnie.core.block.TileEntityMetadata;
|
||||||
import binnie.core.util.I18N;
|
import binnie.core.util.I18N;
|
||||||
import binnie.extratrees.ExtraTrees;
|
import binnie.extratrees.ExtraTrees;
|
||||||
import binnie.extratrees.api.CarpentryManager;
|
import binnie.extratrees.api.CarpentryManager;
|
||||||
|
import extrabiomes.api.Stuff;
|
||||||
|
|
||||||
public class PlankType {
|
public class PlankType {
|
||||||
|
|
||||||
@@ -267,13 +266,10 @@ public class PlankType {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getStack() {
|
public ItemStack getStack() {
|
||||||
try {
|
if (!Mods.extraBiomes.active()) {
|
||||||
Class clss = Class.forName("extrabiomes.api.Stuff");
|
|
||||||
Block block = (Block) ((Optional) clss.getField("planks").get(null)).get();
|
|
||||||
return new ItemStack(block, 1, ordinal());
|
|
||||||
} catch (Exception e) {
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
return Stuff.planks.transform(block -> new ItemStack(block, 1, ordinal())).orNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import net.minecraft.init.Blocks;
|
|||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
import binnie.core.Mods;
|
||||||
import binnie.core.block.TileEntityMetadata;
|
import binnie.core.block.TileEntityMetadata;
|
||||||
import binnie.extratrees.ExtraTrees;
|
import binnie.extratrees.ExtraTrees;
|
||||||
import binnie.extratrees.api.CarpentryManager;
|
import binnie.extratrees.api.CarpentryManager;
|
||||||
@@ -17,6 +18,8 @@ import binnie.extratrees.block.decor.FenceType;
|
|||||||
|
|
||||||
public class WoodManager {
|
public class WoodManager {
|
||||||
|
|
||||||
|
private static List<IPlankType> allPlankTypes;
|
||||||
|
|
||||||
public static IPlankType getPlankType(int index) {
|
public static IPlankType getPlankType(int index) {
|
||||||
IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index);
|
IDesignMaterial wood = CarpentryManager.carpentryInterface.getWoodMaterial(index);
|
||||||
if (wood instanceof IPlankType) {
|
if (wood instanceof IPlankType) {
|
||||||
@@ -97,16 +100,18 @@ public class WoodManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<IPlankType> getAllPlankTypes() {
|
public static List<IPlankType> getAllPlankTypes() {
|
||||||
|
if (allPlankTypes != null) {
|
||||||
|
return allPlankTypes;
|
||||||
|
}
|
||||||
|
|
||||||
List<IPlankType> list = new ArrayList<>();
|
List<IPlankType> list = new ArrayList<>();
|
||||||
Collections.addAll(list, PlankType.ExtraTreePlanks.values());
|
Collections.addAll(list, PlankType.ExtraTreePlanks.values());
|
||||||
Collections.addAll(list, PlankType.ForestryPlanks.values());
|
Collections.addAll(list, PlankType.ForestryPlanks.values());
|
||||||
for (IPlankType type : PlankType.ExtraBiomesPlank.values()) {
|
if (Mods.extraBiomes.active()) {
|
||||||
if (type.getStack() != null) {
|
Collections.addAll(list, PlankType.ExtraBiomesPlank.values());
|
||||||
list.add(type);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Collections.addAll(list, PlankType.VanillaPlanks.values());
|
Collections.addAll(list, PlankType.VanillaPlanks.values());
|
||||||
|
allPlankTypes = list;
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.extratrees.nei;
|
package binnie.extratrees.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package binnie.genetics.nei;
|
package binnie.genetics.nei;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.Rectangle;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user