aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath16
-rw-r--r--.directory6
-rw-r--r--.gitignore5
-rw-r--r--.idea/.gitignore3
-rw-r--r--.idea/.name1
-rw-r--r--.idea/codeStyles/Project.xml7
-rw-r--r--.idea/codeStyles/codeStyleConfig.xml5
-rw-r--r--.idea/dictionaries/kekzd.xml10
-rw-r--r--.idea/misc.xml6
-rw-r--r--.idea/modules.xml9
-rw-r--r--.idea/uiDesigner.xml124
-rw-r--r--.idea/vcs.xml6
-rw-r--r--.project17
-rw-r--r--build.gradle46
-rw-r--r--libs/Baubles-1.7.10-1.0.1.11.jar (renamed from mods/1.7.10/Baubles-1.7.10-1.0.1.11.jar)bin86746 -> 86746 bytes
-rw-r--r--libs/TecTech-1.7.10-4.10.4-d35bc08e-dev.jar (renamed from libs/TecTech-1.7.10-3.8.1-dev.jar)bin3382312 -> 3478684 bytes
-rw-r--r--libs/YAMCore-1.7.10-0.5.78.jar (renamed from mods/YAMCore-1.7.10-0.5.78.jar)bin100213 -> 100213 bytes
-rw-r--r--libs/gregtech-5.09.34.16-dev.jar (renamed from libs/gregtech-5.09.33.57-dev.jar)bin11011996 -> 11093772 bytes
-rw-r--r--mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jarbin314810 -> 0 bytes
-rw-r--r--mods/EnderCore-1.7.10-0.2.0.39_beta.jarbin467824 -> 0 bytes
-rw-r--r--mods/EnderIO-1.7.10-2.3.0.432_beta.jarbin4800552 -> 0 bytes
-rw-r--r--mods/bartworks[1.7.10]-0.5.13_pre10.jarbin885812 -> 0 bytes
-rw-r--r--mods/devtips-1.1.jarbin7584 -> 0 bytes
-rw-r--r--mods/ic2/EJML-core-0.26.jarbin341614 -> 0 bytes
-rw-r--r--src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java13
25 files changed, 40 insertions, 234 deletions
diff --git a/.classpath b/.classpath
deleted file mode 100644
index c5199060a4..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="libs/CodeChickenLib-1.7.10-1.1.3.140-dev.jar"/>
- <classpathentry kind="lib" path="libs/gregtech-5.09.32-dev.jar" sourcepath="libs/gregtech-5.09.32-dev-src.zip"/>
- <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.828a-experimental-deobf.jar"/>
- <classpathentry kind="lib" path="libs/NotEnoughItems-1.7.10-1.0.5.120-dev.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/Forge"/>
- <classpathentry kind="lib" path="libs/joml-1.9.18.jar"/>
- <classpathentry kind="lib" path="libs/CodeChickenCore-1.7.10-1.0.7.47-dev.jar"/>
- <classpathentry kind="lib" path="libs/Thaumcraft-1.7.10-4.2.3.5-deobf.jar" sourcepath="D:/Development/Thaumcraft-1.7.10-4.2.3.5-deobf-src.zip"/>
- <classpathentry kind="lib" path="libs/TecTech-1.7.10-3.8.1-dev.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.directory b/.directory
deleted file mode 100644
index 5edbbd9d93..0000000000
--- a/.directory
+++ /dev/null
@@ -1,6 +0,0 @@
-[Dolphin]
-Timestamp=2019,10,7,18,33,15
-Version=4
-
-[Settings]
-HiddenFilesShown=true
diff --git a/.gitignore b/.gitignore
index 184a328784..4917368216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,13 +28,12 @@ usernamecache.json
/crash-reports/
/saves/
/config/
+run/
# intellij related things
-.idea/dictionaries/*
+.idea/
# other stuff
-eclipse/
-eclipse/*
out/
out/*
*.ipr
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521af..0000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index e33e6c76d0..0000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-kekztech \ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 919ce1f1f7..0000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <code_scheme name="Project" version="173">
- <ScalaCodeStyleSettings>
- <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
- </ScalaCodeStyleSettings>
- </code_scheme>
-</component> \ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a179b..0000000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <state>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
- </state>
-</component> \ No newline at end of file
diff --git a/.idea/dictionaries/kekzd.xml b/.idea/dictionaries/kekzd.xml
deleted file mode 100644
index cfc5daa6e8..0000000000
--- a/.idea/dictionaries/kekzd.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectDictionaryState">
- <dictionary name="kekzd">
- <words>
- <w>essentia</w>
- <w>ichor</w>
- <w>lapotronic</w>
- <w>thaumium</w>
- </words>
- </dictionary>
-</component> \ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 84da703c3b..0000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/classes" />
- </component>
-</project> \ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index a881e90a4c..0000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/../Forge/Forge.iml" filepath="$PROJECT_DIR$/../Forge/Forge.iml" />
- <module fileurl="file://$PROJECT_DIR$/kekztech.iml" filepath="$PROJECT_DIR$/kekztech.iml" />
- </modules>
- </component>
-</project> \ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534fb27..0000000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
-</project> \ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddfbb..0000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project> \ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index b83d47ff64..0000000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>kekztech</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/build.gradle b/build.gradle
index 6d44e79f60..e107fcfba2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,9 +9,13 @@ buildscript {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
+ maven {
+ name = "jitpack.io"
+ url = "https://jitpack.io"
+ }
}
dependencies {
- classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+ classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
}
}
@@ -25,7 +29,7 @@ archivesBaseName = "kekztech"
minecraft {
version = "1.7.10-10.13.4.1614-1.7.10"
- runDir = "eclipse"
+ runDir = "run"
}
dependencies {
@@ -33,7 +37,9 @@ dependencies {
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"
-
+
+ compile fileTree(dir: 'libs', include: '*.jar')
+
// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
@@ -45,21 +51,21 @@ dependencies {
}
processResources
-{
- // this will ensure that this task is redone when the versions change.
- inputs.property "version", project.version
- inputs.property "mcversion", project.minecraft.version
+ {
+ // this will ensure that this task is redone when the versions change.
+ inputs.property "version", project.version
+ inputs.property "mcversion", project.minecraft.version
- // replace stuff in mcmod.info, nothing else
- from(sourceSets.main.resources.srcDirs) {
- include 'mcmod.info'
-
- // replace version and mcversion
- expand 'version':project.version, 'mcversion':project.minecraft.version
- }
-
- // copy everything else, thats not the mcmod.info
- from(sourceSets.main.resources.srcDirs) {
- exclude 'mcmod.info'
- }
-}
+ // replace stuff in mcmod.info, nothing else
+ from(sourceSets.main.resources.srcDirs) {
+ include 'mcmod.info'
+
+ // replace version and mcversion
+ expand 'version':project.version, 'mcversion':project.minecraft.version
+ }
+
+ // copy everything else, thats not the mcmod.info
+ from(sourceSets.main.resources.srcDirs) {
+ exclude 'mcmod.info'
+ }
+ }
diff --git a/mods/1.7.10/Baubles-1.7.10-1.0.1.11.jar b/libs/Baubles-1.7.10-1.0.1.11.jar
index 6f05d6227e..6f05d6227e 100644
--- a/mods/1.7.10/Baubles-1.7.10-1.0.1.11.jar
+++ b/libs/Baubles-1.7.10-1.0.1.11.jar
Binary files differ
diff --git a/libs/TecTech-1.7.10-3.8.1-dev.jar b/libs/TecTech-1.7.10-4.10.4-d35bc08e-dev.jar
index 44e3442d87..694bc0d22f 100644
--- a/libs/TecTech-1.7.10-3.8.1-dev.jar
+++ b/libs/TecTech-1.7.10-4.10.4-d35bc08e-dev.jar
Binary files differ
diff --git a/mods/YAMCore-1.7.10-0.5.78.jar b/libs/YAMCore-1.7.10-0.5.78.jar
index e60262ce5b..e60262ce5b 100644
--- a/mods/YAMCore-1.7.10-0.5.78.jar
+++ b/libs/YAMCore-1.7.10-0.5.78.jar
Binary files differ
diff --git a/libs/gregtech-5.09.33.57-dev.jar b/libs/gregtech-5.09.34.16-dev.jar
index d84ef3b813..14eec73230 100644
--- a/libs/gregtech-5.09.33.57-dev.jar
+++ b/libs/gregtech-5.09.34.16-dev.jar
Binary files differ
diff --git a/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar b/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar
deleted file mode 100644
index 9aa3d80afd..0000000000
--- a/mods/1.7.10/CodeChickenLib-1.7.10-1.1.3.140-universal.jar
+++ /dev/null
Binary files differ
diff --git a/mods/EnderCore-1.7.10-0.2.0.39_beta.jar b/mods/EnderCore-1.7.10-0.2.0.39_beta.jar
deleted file mode 100644
index 1fdf703497..0000000000
--- a/mods/EnderCore-1.7.10-0.2.0.39_beta.jar
+++ /dev/null
Binary files differ
diff --git a/mods/EnderIO-1.7.10-2.3.0.432_beta.jar b/mods/EnderIO-1.7.10-2.3.0.432_beta.jar
deleted file mode 100644
index 80711b5846..0000000000
--- a/mods/EnderIO-1.7.10-2.3.0.432_beta.jar
+++ /dev/null
Binary files differ
diff --git a/mods/bartworks[1.7.10]-0.5.13_pre10.jar b/mods/bartworks[1.7.10]-0.5.13_pre10.jar
deleted file mode 100644
index b1a8b4322f..0000000000
--- a/mods/bartworks[1.7.10]-0.5.13_pre10.jar
+++ /dev/null
Binary files differ
diff --git a/mods/devtips-1.1.jar b/mods/devtips-1.1.jar
deleted file mode 100644
index a5e373537b..0000000000
--- a/mods/devtips-1.1.jar
+++ /dev/null
Binary files differ
diff --git a/mods/ic2/EJML-core-0.26.jar b/mods/ic2/EJML-core-0.26.jar
deleted file mode 100644
index 8f1fe755e6..0000000000
--- a/mods/ic2/EJML-core-0.26.jar
+++ /dev/null
Binary files differ
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
index 2476b2cf87..0b95e5ffb2 100644
--- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
+++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
@@ -608,5 +608,16 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
@Override
public boolean explodesOnComponentBreak(ItemStack stack) { return false; }
-
+
+ @Override
+ public long maxEUStore()
+ {
+ return capacity.longValue();
+ }
+
+ @Override
+ public long getEUVar()
+ {
+ return stored.longValue();
+ }
}
generated by cgit (git 2.46.0) at 2025-03-09 17:39:28 +0000