Skip to content

Commit 568962c

Browse files
committed
init
0 parents  commit 568962c

File tree

197 files changed

+9711
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+9711
-0
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.gitignore

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# eclipse
2+
bin
3+
*.launch
4+
.settings
5+
.metadata
6+
.classpath
7+
.project
8+
9+
# idea
10+
out
11+
*.ipr
12+
*.iws
13+
*.iml
14+
.idea
15+
16+
# gradle
17+
build
18+
.gradle
19+
20+
# other
21+
run
22+
classes
23+
logs/debug.log
24+
logs/latest.log

LICENSE.txt

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

README.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
2+
Port with permission from phantamanta44.
3+
4+
# AE2 Fluid Crafting Rework
5+
6+
[![Downloads](https://cf.way2muchnoise.eu/full_623955_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/ae2-fluid-crafting-rework) ![MCVsrsion](https://cf.way2muchnoise.eu/versions/623955.svg)
7+
8+
Put fluids in the pattern!
9+
10+
AE2 autocrafting is amazing and everyone loves it, but it is always becoming painful when dealing with fluids. You have to put fluids in a container or use a dummy item to write patterns with fluids.
11+
12+
That's because AE2 doesn't support fluid as valid crafting ingredients before 1.16, so it can't handle fluids directly.
13+
14+
However, it is changed now! With **AE2 Fluid Crafting** you can write patterns with fluids freely. Your AE system can output and accept fluids like items without worrying about how to handle these fluid cells.
15+
16+
This is a rework and ported version of [ae2-fluid-crafting](https://github.com/phantamanta44/ae2-fluid-crafting)
17+
18+
## Features
19+
20+
- You can code fluid patterns on fluid terminal directly.
21+
- Mult/Div/Add/Sub Button also works on fluid.
22+
- An extended fluid terminal with 16 inputs and 4 outputs.
23+
- You can add or decrease fluid's amount by clicking with container.
24+
- Fluid Pattern can display its contents when put on pattern terminal.
25+
- [1.12.2] Fix the fluid amount display error when removing fluid.
26+
- [1.12.2] Upgrade cards can be inserted in Dual Interface.
27+
- [1.12.2] Fluid pattern is searchable in interface terminal.
28+
- [1.12.2] Fix crash when using block mode, fluid will also be considered as blockable.
29+
- [1.12.2] Fluid export bus supports crafting card.
30+
31+
## Installation
32+
33+
### 1.7.10
34+
Any version of AE2(Both Official AE2 and GTNH edition AE2 works).
35+
36+
**Extra Cells isn't needed**
37+
38+
### 1.12.2
39+
Unofficial AE2([PAE2](https://www.curseforge.com/minecraft/mc-mods/ae2-extended-life)).
40+
41+
You can directly upgrade origin AE2FC2 in your old save.
42+
43+
Official AE2 isn't supported, you can use origin [AE2FC](https://github.com/phantamanta44/ae2-fluid-crafting) if you are playing with Official AE2.
44+
45+
## How to Use It
46+
https://github.com/GlodBlock/AE2FluidCraft-Rework/wiki
47+
48+
## Credited Works
49+
50+
E. Geng(@phantamanta44) and KilaBash (@Yefancy) - Their amazing origin work in 1.12.

build.gradle

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
buildscript {
2+
repositories {
3+
maven {
4+
url 'https://maven.minecraftforge.net/'
5+
}
6+
maven {
7+
name 'Scala CI dependencies'
8+
url 'https://repo1.maven.org/maven2/'
9+
}
10+
maven {
11+
name "forge"
12+
url "https://files.minecraftforge.net/maven"
13+
}
14+
maven {
15+
name "mixins"
16+
url "https://repo.spongepowered.org/repository/maven-public/"
17+
}
18+
mavenLocal()
19+
}
20+
dependencies {
21+
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
22+
classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
23+
}
24+
}
25+
26+
apply plugin: 'net.minecraftforge.gradle'
27+
apply plugin: 'idea'
28+
apply plugin: 'org.spongepowered.mixin'
29+
30+
version = "1.0.0-a"
31+
group = "ae2fc"
32+
archivesBaseName = "Fluid Craft for AE2"
33+
34+
sourceCompatibility = targetCompatibility = '1.8'
35+
compileJava {
36+
sourceCompatibility = targetCompatibility = '1.8'
37+
}
38+
39+
40+
// Generate a fixed tsrg file after generating the default tsrg file
41+
createMcpToSrg {
42+
outputs.upToDateWhen {false}
43+
doLast {
44+
fixFG5TsrgForMixinAP(output.get().asFile, file("${buildDir}/fixMcpToSrg/output.tsrg"))
45+
}
46+
}
47+
48+
// Function that actually fixes the TSRG file
49+
static def fixFG5TsrgForMixinAP(File inFile, File outFile) {
50+
// Make directory if needed
51+
outFile.parentFile.mkdirs()
52+
53+
try (Scanner scanner = new Scanner(inFile); PrintWriter out = new PrintWriter(outFile)) {
54+
boolean firstLine = true
55+
while (scanner.hasNextLine()) {
56+
String next = scanner.nextLine()
57+
58+
// Skip first 'tsrg left right' header line
59+
if (firstLine) {
60+
firstLine = false
61+
continue
62+
}
63+
64+
// Skip 'static' indicators
65+
if (next.trim() == "static") {
66+
continue
67+
}
68+
69+
// Export line otherwise
70+
out.println(next)
71+
}
72+
}
73+
}
74+
75+
repositories {
76+
maven { url 'https://dvs1.progwml6.com/files/maven/' }
77+
maven { url 'https://cursemaven.com/' }
78+
maven { url "https://www.cursemaven.com" }
79+
}
80+
81+
dependencies {
82+
minecraft([
83+
group : "net.minecraftforge",
84+
name : "forge",
85+
version: "1.16.5-36.1.17"
86+
])
87+
annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'
88+
implementation fg.deobf('mezz.jei:jei-1.16.5:7.7.0.98') //jei
89+
implementation fg.deobf('curse.maven:ae2-extended-life-223794:3608871') //ae2
90+
implementation fg.deobf('curse.maven:packagedauto-308380:4478954') //pauto
91+
}
92+
93+
minecraft {
94+
mappings channel: 'snapshot', version: '20210309-1.16.5'
95+
accessTransformer = file('src/main/resources/META-INF/ae2fc_at.cfg')
96+
runs {
97+
client = {
98+
properties "forge.logging.markers": "SCAN,REGISTRIES,REGISTRYDUMP"
99+
properties "forge.logging.console.level": "debug"
100+
properties "mixin.env.remapRefMap": "true"
101+
properties "mixin.env.refMapRemappingFile": "${projectDir}/build/createSrgToMcp/output.srg".toString()
102+
workingDirectory project.file("run").canonicalPath
103+
arg "-mixin.config=" + "mixins.ae2fc.json"
104+
source sourceSets.main
105+
}
106+
server = {
107+
properties "forge.logging.markers": "SCAN,REGISTRIES,REGISTRYDUMP"
108+
properties "forge.logging.console.level": "debug"
109+
properties "mixin.env.remapRefMap": "true"
110+
properties "mixin.env.refMapRemappingFile": "${projectDir}/build/createSrgToMcp/output.srg".toString()
111+
workingDirectory project.file("run").canonicalPath
112+
arg "-mixin.config=" + "mixins.ae2fc.json"
113+
source sourceSets.main
114+
}
115+
}
116+
}
117+
118+
jar {
119+
manifest {
120+
attributes([
121+
"Specification-Title": "FluidCraftForAE2",
122+
"Specification-Vendor": "GlodBlock",
123+
"Specification-Version": "1",
124+
"Implementation-Title": "${archivesBaseName}",
125+
"Implementation-Version": "${version}",
126+
"Implementation-Vendor": "GlodBlock",
127+
"TweakClass": "org.spongepowered.asm.launch.MixinTweaker",
128+
"TweakOrder": 0,
129+
"MixinConfigs": "mixins.ae2fc.json"
130+
])
131+
}
132+
}
133+
134+
mixin {
135+
reobfSrgFile = file("${buildDir}/fixMcpToSrg/output.tsrg")
136+
add sourceSets.main, "mixins.ae2fc.refmap.json"
137+
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.jvmargs=-Xmx8G -XX:MaxPermSize=512m

gradle/wrapper/gradle-wrapper.jar

57.3 KB
Binary file not shown.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
zipStoreBase=GRADLE_USER_HOME
4+
zipStorePath=wrapper/dists
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)