Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f499fcaeff | |||
| 80886c11ce | |||
| 39f8d0ee7e |
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry",
|
"homepage": "https://www.curseforge.com/minecraft/mc-mods/electroblobs-wizardry",
|
||||||
"promos": {
|
"promos": {
|
||||||
"1.12.2-latest": "4.3.16",
|
"1.12.2-latest": "4.3.17",
|
||||||
"1.12.2-recommended": "4.3.16"
|
"1.12.2-recommended": "4.3.17"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
name: Gradle Build
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ "**" ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Set up JDK 8
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
java-version: '8'
|
||||||
|
distribution: 'temurin'
|
||||||
|
|
||||||
|
- name: Load Cache
|
||||||
|
uses: actions/cache@v5
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
~/.gradle/caches
|
||||||
|
~/.gradle/wrapper
|
||||||
|
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-gradle-
|
||||||
|
|
||||||
|
- name: Setup Gradle
|
||||||
|
uses: gradle/actions/setup-gradle@v4
|
||||||
|
with:
|
||||||
|
cache-read-only: ${{ github.ref != 'refs/heads/1.12.2' }}
|
||||||
|
|
||||||
|
- name: Grant execute permission for gradlew
|
||||||
|
run: chmod +x gradlew
|
||||||
|
|
||||||
|
- name: Build with Gradle
|
||||||
|
run: ./gradlew build --max-workers=1 --no-daemon
|
||||||
|
|
||||||
|
- name: Upload build artifacts
|
||||||
|
if: success()
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: build-artifacts
|
||||||
|
path: build/libs/*.jar
|
||||||
|
retention-days: 30
|
||||||
+1
-1
@@ -38,7 +38,7 @@ apply plugin: org.ajoberstar.grgit.gradle.GrgitPlugin
|
|||||||
apply plugin: 'wtf.gofancy.fancygradle'
|
apply plugin: 'wtf.gofancy.fancygradle'
|
||||||
|
|
||||||
|
|
||||||
version = "4.3.16"
|
version = "4.3.17"
|
||||||
group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
group= "electroblob.wizardry"// http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||||
archivesBaseName = "ElectroblobsWizardry"
|
archivesBaseName = "ElectroblobsWizardry"
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class Wizardry {
|
|||||||
* 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
|
* 1.x.x represents Minecraft 1.7.x versions, 2.x.x represents Minecraft 1.10.x versions, 3.x.x represents Minecraft
|
||||||
* 1.11.x versions, and so on.
|
* 1.11.x versions, and so on.
|
||||||
*/
|
*/
|
||||||
public static final String VERSION = "4.3.16";
|
public static final String VERSION = "4.3.17";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Json file used by Forge's built-in <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>.
|
* Json file used by Forge's built-in <a href="https://mcforge.readthedocs.io/en/1.12.x/gettingstarted/autoupdate/">update checker</a>.
|
||||||
|
|||||||
@@ -206,6 +206,10 @@ public final class AllyDesignationSystem {
|
|||||||
* generally used to determine targets for healing or other group buffs. */
|
* generally used to determine targets for healing or other group buffs. */
|
||||||
public static boolean isAllied(EntityLivingBase allyOf, EntityLivingBase possibleAlly){
|
public static boolean isAllied(EntityLivingBase allyOf, EntityLivingBase possibleAlly){
|
||||||
|
|
||||||
|
if (allyOf == null || possibleAlly == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Owned entities inherit their owner's allies
|
// Owned entities inherit their owner's allies
|
||||||
if(allyOf instanceof IEntityOwnable){
|
if(allyOf instanceof IEntityOwnable){
|
||||||
Entity owner = ((IEntityOwnable)allyOf).getOwner();
|
Entity owner = ((IEntityOwnable)allyOf).getOwner();
|
||||||
|
|||||||
Reference in New Issue
Block a user