Added Mekanism support!

The boiler is now capable of outputting Mekanism Steam when prompted to do so by a gas extracting device (such as a Pressurized Tube set to pull). I've yet to add support for inputting gas as fuel, though.
BGazotti · Apr 20, 2021 · d5193d2 · d5193d2
1 parent 5b3be5a
commit d5193d2
Show file tree

Hide file tree

Showing 24 changed files with 547 additions and 391 deletions.
diff --git a/.classpath b/.classpath
@@ -2,22 +2,40 @@
 <classpath>
 	<classpathentry kind="src" output="bin/main" path="src/main/java">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Users\gazotti\git\borkler\build\natives"/>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/kili/linuxpog/Borkler/build/natives"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/main" path="src/main/resources">
 		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="C:\Users\gazotti\git\borkler\build\natives"/>
 			<attribute name="gradle_scope" value="main"/>
 			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/kili/linuxpog/Borkler/build/natives"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre8"/>
+	<classpathentry kind="src" output="bin/main" path="src/generated/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/kili/linuxpog/Borkler/build/natives"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/kili/linuxpog/Borkler/build/natives"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/home/kili/linuxpog/Borkler/build/natives"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="lib" path="ZenScript-1.0.0.jar"/>
-	<classpathentry kind="lib" path="jei-1.16.5-7.6.1.75-api.jar" sourcepath="jei-1.16.5-7.6.1.75-sources.jar"/>
-	<classpathentry kind="lib" path="CraftTweaker-1.16.5-7.1.0.203-deobf.jar"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://modmaven.dev' }
         jcenter()
         mavenCentral()
     }
@@ -28,6 +29,8 @@ repositories {
 	    name = "ModMaven"
 	    url = "https://modmaven.k-4u.nl"
 	  }
+	//Mekanism
+
 }
 
 dependencies {
@@ -37,7 +40,12 @@ dependencies {
 	compileOnly fg.deobf("mezz.jei:jei-1.16.5:7.6.1.75:api")
     // at runtime, use the full JEI jar
     runtimeOnly fg.deobf("mezz.jei:jei-1.16.5:7.6.1.75")
-
+    //mekanism
+    compileOnly fg.deobf("mekanism:Mekanism:1.16.5-10.0.21.448:api")
+    compile fg.deobf("mekanism:Mekanism:1.16.5-10.0.21.448")
+    runtimeOnly fg.deobf("mekanism:Mekanism:1.16.5-10.0.21.448")
+    runtimeOnly fg.deobf("mekanism:Mekanism:1.16.5-10.0.21.448:additions")
+    runtimeOnly fg.deobf("mekanism:Mekanism:1.16.5-10.0.21.448:generators")
 }
 
 version = '1.0'
@@ -53,7 +61,7 @@ minecraft {
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20201028-1.16.3'
+    mappings channel: 'official', version: '1.16.5'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -139,7 +147,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.5-36.0.43'
+    minecraft 'net.minecraftforge:forge:1.16.5-36.1.0'
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"
@@ -167,9 +175,9 @@ jar {
         attributes([
             "Specification-Title": "borkler",
             "Specification-Vendor": "gazcreations",
-            "Specification-Version": "0.2.2", // We are version 1 of ourselves
+            "Specification-Version": "0.2.3", 
             "Implementation-Title": "borkler",
-            "Implementation-Version": "0.2.2",
+            "Implementation-Version": "0.2.3",
             "Implementation-Vendor" :"gazcreations",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
+
diff --git a/runClient.launch b/runClient.launch
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
-  <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
-  <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
-  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
-  <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
-  <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-    <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
-    <mapEntry key="MCP_MAPPINGS" value="snapshot_20201028-1.16.3"/>
-    <mapEntry key="MCP_VERSION" value="20210115.111550"/>
-    <mapEntry key="FORGE_VERSION" value="36.0.43"/>
-    <mapEntry key="assetIndex" value="1.16"/>
-    <mapEntry key="assetDirectory" value="/home/kili/.gradle/caches/forge_gradle/assets"/>
-    <mapEntry key="nativesDirectory" value="/home/kili/linuxpog/Borkler/build/natives"/>
-    <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
-    <mapEntry key="target" value="fmluserdevclient"/>
-    <mapEntry key="MC_VERSION" value="1.16.5"/>
-  </mapAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
+        <mapEntry key="FORGE_VERSION" value="36.1.0"/>
+        <mapEntry key="MCP_MAPPINGS" value="official_1.16.5"/>
+        <mapEntry key="MCP_VERSION" value="20210115.111550"/>
+        <mapEntry key="MC_VERSION" value="1.16.5"/>
+        <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
+        <mapEntry key="assetDirectory" value="/home/kili/.gradle/caches/forge_gradle/assets"/>
+        <mapEntry key="assetIndex" value="1.16"/>
+        <mapEntry key="nativesDirectory" value="/home/kili/linuxpog/Borkler/build/natives"/>
+        <mapEntry key="target" value="fmluserdevclient"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
 </launchConfiguration>
diff --git a/runData.launch b/runData.launch
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
-  <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
-  <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
-  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--mod borkler --all --output /home/kili/linuxpog/Borkler/src/generated/resources --existing /home/kili/linuxpog/Borkler/src/main/resources"/>
-  <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
-  <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-    <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
-    <mapEntry key="MCP_MAPPINGS" value="snapshot_20201028-1.16.3"/>
-    <mapEntry key="MCP_VERSION" value="20210115.111550"/>
-    <mapEntry key="FORGE_VERSION" value="36.0.43"/>
-    <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
-    <mapEntry key="target" value="fmluserdevdata"/>
-    <mapEntry key="MC_VERSION" value="1.16.5"/>
-  </mapAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
+        <mapEntry key="FORGE_VERSION" value="36.1.0"/>
+        <mapEntry key="MCP_MAPPINGS" value="official_1.16.5"/>
+        <mapEntry key="MCP_VERSION" value="20210115.111550"/>
+        <mapEntry key="MC_VERSION" value="1.16.5"/>
+        <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
+        <mapEntry key="target" value="fmluserdevdata"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--mod borkler --all --output /home/kili/linuxpog/Borkler/src/generated/resources --existing /home/kili/linuxpog/Borkler/src/main/resources"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
 </launchConfiguration>
diff --git a/runServer.launch b/runServer.launch
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
-  <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
-  <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
-  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
-  <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
-  <mapAttribute key="org.eclipse.debug.core.environmentVariables">
-    <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
-    <mapEntry key="MCP_MAPPINGS" value="snapshot_20201028-1.16.3"/>
-    <mapEntry key="MCP_VERSION" value="20210115.111550"/>
-    <mapEntry key="FORGE_VERSION" value="36.0.43"/>
-    <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
-    <mapEntry key="target" value="fmluserdevserver"/>
-    <mapEntry key="MC_VERSION" value="1.16.5"/>
-  </mapAttribute>
+    <mapAttribute key="org.eclipse.debug.core.environmentVariables">
+        <mapEntry key="FORGE_GROUP" value="net.minecraftforge"/>
+        <mapEntry key="FORGE_VERSION" value="36.1.0"/>
+        <mapEntry key="MCP_MAPPINGS" value="official_1.16.5"/>
+        <mapEntry key="MCP_VERSION" value="20210115.111550"/>
+        <mapEntry key="MC_VERSION" value="1.16.5"/>
+        <mapEntry key="MOD_CLASSES" value="borkler%%/home/kili/linuxpog/Borkler/bin/main:borkler%%/home/kili/linuxpog/Borkler/bin/main"/>
+        <mapEntry key="target" value="fmluserdevserver"/>
+    </mapAttribute>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraftforge.userdev.LaunchTesting"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Borkler"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dforge.logging.console.level=debug -Dforge.logging.markers=REGISTRIES"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/home/kili/linuxpog/Borkler/run"/>
 </launchConfiguration>
diff --git a/src/main/java/gazcreations/borkler/Index.java b/src/main/java/gazcreations/borkler/Index.java
@@ -67,7 +67,7 @@ public static final class Items {
 
 	@ObjectHolder(value = "borkler:borklertile")
 	public static final TileEntityType<?> BORKLER_TE_TYPE = TileEntityType.Builder
-			.create(BorklerTileEntity::new, Index.Blocks.BORKLERBLOCK).build(null)
+			.of(BorklerTileEntity::new, Index.Blocks.BORKLERBLOCK).build(null)
 			.setRegistryName("borkler", "borklertile");
 
 	@SuppressWarnings("unchecked")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip