All apothecaries done finally

Fix RF interaction with the Mana Fluxfield

.github/scripts/test-no-error-reports.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-

.github/workflows/build-and-test.yml

@@ -1,45 +0,0 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Build and test
-
-on:
-  pull_request:
-    branches: [ master, main ]
-  push:
-    branches: [ master, main ]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1.5 minutes
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt
-        timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
-
-    - name: Test no errors reported during server run
-      run: |
-        chmod +x .github/scripts/test-no-error-reports.sh
-        .github/scripts/test-no-error-reports.sh

.github/workflows/release-tags.yml

@@ -1,51 +0,0 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Release tagged build
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
-
-      - name: Publish to Maven
-        run: ./gradlew publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -1,32 +1,61 @@
-.gradle
-.settings
-/.idea/
-/.vscode/
-/run/
-/build/
-/eclipse/
-.classpath
-.project
-/bin/
-/config/
-/crash-reports/
-/logs/
-options.txt
-/saves/
-usernamecache.json
-banned-ips.json
-banned-players.json
-eula.txt
-ops.json
-server.properties
-servers.dat
-usercache.json
-whitelist.json
-/out/
-*.iml
-*.ipr
-*.iws
-src/main/resources/mixins.*.json
-*.bat
-*.DS_Store
-!gradlew.bat
+## Windows
+Thumbs.db
+
+## gradle
+/.gradle
+/build
+
+## ForgeGradle
+/run
+
+## eclipse
+/.settings
+/.metadata
+/.classpath
+/.project
+/eclipse
+/bin
+
+## intellij
+/out
+/.idea
+/atlassian-ide-plugin.xml
+/*.ipr
+/*.iws
+/*.iml
+
+## Private Stuffs
+/private.properties
+
+## Jars
+*.jar
+!/gradle/wrapper/gradle-wrapper.jar
+!GardenOfGlass.jar
+
+### OSX (adds a lot of garbage)###
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+

CODEOWNERS

@@ -1,3 +0,0 @@
-# Any Github changes require admin approval
-/.github/** @GTNewHorizons/admin
-

MC18_notes.txt

@@ -0,0 +1,29 @@
+-- API --
+* Updated to BlockPos and EnumFacing everywhere where it made sense
+* Registering repainting blocks will need to also receive a PropertyEnum with EnumDyeColor as the component type
+so Botania knows what property to set the color on
+* ICorporeaSpark.getInventory had to be changed to ICorporeaSpark.getSparkInventory because the signature clashed (IInventory vs ItemStack[], respectively)
+This can be changed to match vanilla signature, but either would break backward compat.
+* SubTileEntity.getComparatorInputOverride parameter removed (it was actually incorrect also. Not side, but the meta of the block).
+Anyways, vanilla removed it from their method so we follow suit.
+* SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts
+* Multiblock system reworked to use states and blockposes
+* Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard.
+* Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with
+* Removed icon methods from SubTileSignature
+
+-- Other --
+* Lang entries to be updated in non-english: Corporea funnel new numbers. Moving of prismarine entry.
+* Most things left untouched to make patches from upstream easier
+* Most uses of chunkcoordinates directly convert blockpos (THANK YOU VAZKII FOR USING THEM). Remove creation of extra instances
+since BlockPos'es are immutable and thus can be reused everywhere.
+* Some really needed fields in EntityItem are private now. Reflection time :(
+* Alfglass now just uses the vanilla random model selection system to choose a pattern. Some of your builds may look different.
+Unless someone figures out a way to use the old one
+* The alt textures will probably be a resource pack now to decrease complexity...
+sorry :/ The systems needed to dynamically switch out the textures like that is not worth just throwing them into a resource pack
+* Slabs are kinda janky if you look at them - Mojang made some extremely silly assumptions and we're going to have to go with them
+* Quartz stair textures may be assigned incorrectly - resource pack authors check me
+* Glass pane inner faces are not getting culled (vanilla bug?)
+* Some item forms of technical/non-user blocks are removed
+    * Full list: [all double slab items, all solid vine items]

README.md

@@ -1,3 +1,18 @@
+1.8 PORT README:
+
+This is williewillus' 1.8(.8) port of Botania!
+
+All licensing and distribution rights are exactly as 1.7.10 Botania
+
+Use at your own risk as bugs may pop up unexpectedly.
+
+I will EXACTLY match Vazkii/upstream design wise so NEVER ask me for balance or design changes. No.
+
+Please report all 1.8 bugs to MY REPOSITORY, NOT VAZKII'S.
+
+These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.
+
+
 ![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)  
 Welcome to the Botania repository.