Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LoveHoly/Ex-Astris
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.09
Choose a base ref
...
head repository: LoveHoly/Ex-Astris
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Sep 21, 2014

  1. Create zh_CN.lang

    :)Let‘s add the translation file for Chinese.
    crafteverywhere committed Sep 21, 2014
    Copy the full SHA
    c1417ad View commit details
  2. Merge pull request #4 from crafteverywhere/patch-1

    Create zh_CN.lang
    LoveHoly committed Sep 21, 2014
    Copy the full SHA
    e4f621a View commit details
  3. Update README.md

    LoveHoly committed Sep 21, 2014
    Copy the full SHA
    e2e8283 View commit details

Commits on Sep 22, 2014

  1. Update Crook effect texture fix2

    갈고리 개조 이미지 수정
    nark31 committed Sep 22, 2014
    Copy the full SHA
    7698177 View commit details
  2. Merge pull request #5 from nark31/master

    Update Crook effect texture fix2
    LoveHoly committed Sep 22, 2014
    Copy the full SHA
    86b23d4 View commit details
  3. Copy the full SHA
    8cc805f View commit details
  4. Copy the full SHA
    b9ca750 View commit details
  5. Update README.md

    LoveHoly committed Sep 22, 2014
    Copy the full SHA
    de7f99b View commit details

Commits on Sep 23, 2014

  1. Copy the full SHA
    0df25e4 View commit details
  2. Language file edit

    LoveHoly committed Sep 23, 2014
    Copy the full SHA
    007c723 View commit details

Commits on Sep 27, 2014

  1. Copy the full SHA
    2a7bec7 View commit details
  2. i mistake waila;;

    LoveHoly committed Sep 27, 2014
    Copy the full SHA
    0200be5 View commit details
  3. version 1.10a

    LoveHoly committed Sep 27, 2014
    Copy the full SHA
    f9ca71b View commit details
  4. Update zh_CN.lang

    Guro2 committed Sep 27, 2014
    Copy the full SHA
    8a8a5e0 View commit details

Commits on Sep 28, 2014

  1. Merge pull request #7 from ViKaleidoscope/patch-1

    Update zh_CN.lang
    LoveHoly committed Sep 28, 2014
    Copy the full SHA
    d088c51 View commit details
  2. Copy the full SHA
    1d6f9df View commit details
  3. texture fix

    LoveHoly committed Sep 28, 2014
    Copy the full SHA
    d810f3c View commit details

Commits on Oct 1, 2014

  1. Hold Rotary Apiary

    LoveHoly committed Oct 1, 2014
    Copy the full SHA
    992048c View commit details
  2. metallurgy ...

    LoveHoly committed Oct 1, 2014
    Copy the full SHA
    afb8273 View commit details

Commits on Oct 2, 2014

  1. Update zh_CN.lang

    Guro2 committed Oct 2, 2014
    Copy the full SHA
    1c432ba View commit details
  2. Merge pull request #8 from ViKaleidoscope/patch-1

    Update zh_CN.lang
    LoveHoly committed Oct 2, 2014
    Copy the full SHA
    f68183b View commit details
  3. Update zh_CN.lang

    LoveHoly committed Oct 2, 2014
    Copy the full SHA
    0052a2a View commit details

Commits on Oct 3, 2014

  1. Thks Seren!

    LoveHoly committed Oct 3, 2014
    Copy the full SHA
    839a70d View commit details

Commits on Oct 4, 2014

  1. Copy the full SHA
    2a4200a View commit details

Commits on Oct 6, 2014

  1. Copy the full SHA
    bbec0db View commit details
  2. SCStone Bug Fix

    LoveHoly committed Oct 6, 2014
    Copy the full SHA
    43ee9e1 View commit details
  3. Copy the full SHA
    d94b9b1 View commit details

Commits on Dec 18, 2014

  1. Major code cleanup. Added upgrade slots and logic to Automatic Sieve.…

    … Shift+Click issue currently on upgrades
    Michael Lydeamore committed Dec 18, 2014
    Copy the full SHA
    1f1242f View commit details
  2. Re-added the compat, now that I'm less of a derp

    Michael Lydeamore committed Dec 18, 2014
    Copy the full SHA
    3f24f0b View commit details

Commits on Dec 19, 2014

  1. Overhaul Config, effective speed and energy of Auto Sieve. GUI RF/t a…

    …dded.
    Michael Lydeamore committed Dec 19, 2014
    Copy the full SHA
    418f959 View commit details
  2. More config overhaul. No more caps

    Michael Lydeamore committed Dec 19, 2014
    Copy the full SHA
    b78136f View commit details
  3. Sieve now actually uses config value

    Michael Lydeamore committed Dec 19, 2014
    Copy the full SHA
    ab2b0ab View commit details

Commits on Dec 20, 2014

  1. Fortune Upgrade functioning. Shift click working. Icons added. More c…

    …onfig options with regard to the auto-sieve. Mass unused import cleanup.
    Michael Lydeamore committed Dec 20, 2014
    Copy the full SHA
    3e4dd19 View commit details

Commits on Dec 21, 2014

  1. Copy the full SHA
    fca8b95 View commit details
  2. Added Natura Compat, Tinkers OreBerry bushes (inc XP)

    Michael Lydeamore committed Dec 21, 2014
    Copy the full SHA
    29fc451 View commit details

Commits on Jan 1, 2015

  1. Fixed reversed saplings. Added Slimey Sapling from Green Congealed Sl…

    …ime.
    Michael Lydeamore committed Jan 1, 2015
    Copy the full SHA
    c6c0166 View commit details

Commits on Jan 3, 2015

  1. Added beginnings of Auto Hammerer. Removed some debug code from the a…

    …uto sieve (oops!)
    Michael Lydeamore committed Jan 3, 2015
    Copy the full SHA
    6a35a6b View commit details
  2. Copy the full SHA
    84dd642 View commit details

Commits on Jan 4, 2015

  1. Added beginnings of hammer renderer

    Michael Lydeamore committed Jan 4, 2015
    Copy the full SHA
    6ae92d7 View commit details
  2. Copy the full SHA
    877bd1f View commit details
  3. Added ore dictionary support for recipes...

    This should have been a thing from the start :/. I just run into an
    issue while playing Sky Factory 2... you hard code the recipes to use
    Thermal Foundation stuff but Ex Nihilo gives its own types of ingots and
    they were not interchangeable. This is a really quick fix for that.
    Shad0wB1ade committed Jan 4, 2015
    Copy the full SHA
    53a59a9 View commit details
  4. Added gradle.properties

    Michael Lydeamore committed Jan 4, 2015
    Copy the full SHA
    57ec67b View commit details
  5. Merge pull request #1 from MikeLydeamore/master

    Things
    Shad0wB1ade committed Jan 4, 2015
    Copy the full SHA
    2f06d33 View commit details

Commits on Jan 5, 2015

  1. Copy the full SHA
    7241158 View commit details
  2. Copy the full SHA
    eded9f9 View commit details
  3. Copy the full SHA
    18817b8 View commit details
  4. Copy the full SHA
    1dcdb41 View commit details
  5. Merge pull request #4 from Shad0wB1ade/master

    Added ore dictionary support for recipes.
    MikeLydeamore committed Jan 5, 2015
    Copy the full SHA
    3540b25 View commit details
  6. Added some ISidedness to the auto hammer

    Michael Lydeamore committed Jan 5, 2015
    Copy the full SHA
    58d0e82 View commit details
  7. Retextured the Auto Hammer (yay)

    Michael Lydeamore committed Jan 5, 2015
    Copy the full SHA
    3a72970 View commit details
Showing 581 changed files with 7,136 additions and 1,376 deletions.
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
Ex Astris
=========

Originally from LoveHoly, and now maintained by me!
Add mod integration to your SkyBlock.

Please put all suggestions in the issue tracker (preferably using the [Suggestion] Tag).

Thanks to tterrag1098, TehNut, LoveHoly and all the other dev's who keep me sane while working on this.

Ex Nihilo Addon

Coding Help nemonemo , Translating Help Kagerow
Special Thanks

- Coding Help nemonemo
- Translating Help Kagerow, Seren, crafteverywhere, ViKaleidoscope
- Texture Help Nark
155 changes: 131 additions & 24 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -15,42 +15,116 @@ buildscript {
}
}

//repositories {
// maven {
// name = "CurseForge"
// url = "https://minecraft.curseforge.com/api" + project.curseforge_key
// }
//}

apply plugin: 'forge'
apply plugin: 'maven-publish'

version = "1.09"
version = "MC${minecraft_version}-${mod_version}-${System.getenv().BUILD_NUMBER}"
group= "exastris"
archivesBaseName = "Ex-Astris"

minecraft {
version = "1.7.10-10.13.0.1208"
version = "1.7.10-10.13.2.1291"
assetDir = "eclipse/assets"

replace "@VERSION@", project.version
replaceIn "Data/ModData.java"

}

sourceCompatibility = 7
targetCompatibility = 7

repositories {
maven { url 'http://maven.tterrag.com/' }
ivy {
name "CoFHLib"
artifactPattern "http://addons-origin.cursecdn.com/files/2233/88/[module]-[revision].[ext]"
}
ivy {
name "CoFHCore"
artifactPattern "http://addons-origin.cursecdn.com/files/2233/150/[module]-[revision].[ext]"
}
ivy {
name "RedstoneArsenal"
artifactPattern "http://addons-origin.cursecdn.com/files/2232/684/[module]-[revision].[ext]"
}
ivy {
name "ThermalExpansion"
artifactPattern "http://addons-origin.cursecdn.com/files/2233/141/[module]-[revision].[ext]"
}
ivy {
name "ThermalFoundation"
artifactPattern "http://addons-origin.cursecdn.com/files/2233/148/[module]-[revision].[ext]"
}
ivy {
name "BloodMagic"
artifactPattern "http://addons.cursecdn.com/files/2222/331/[module]-[revision].[ext]"
}
ivy {
name "Metallurgy"
artifactPattern "http://addons.cursecdn.com/files/2217/136/[module]-[revision].[ext]"
}
ivy {
name "MetallurgyCore"
artifactPattern "http://addons.cursecdn.com/files/2215/714/[module]-[revision].[ext]"
}
ivy {
name "Draconic-Evolution"
artifactPattern "http://addons.cursecdn.com/files/2225/633/[module]-[revision].[ext]"
}
ivy {
name "witchery"
artifactPattern "http://addons-origin.cursecdn.com/files/2234/410/[module]-[revision].[ext]"
}
maven { url "http://tehnut.info/maven/" }
maven { url = "http://mobiusstrip.eu/maven/" } // Waila
maven { url = "http://chickenbones.net/maven/" } // CCC & NEI
maven { url = "http://dvs1.progwml6.com/files/maven/" } // TCon and Mantle
maven {
name = "Team Metallurgy Maven"
url = "http://shadow.gcod.net/maven"
}
maven { url = "http://maven.tterrag.com/" }
maven {
name = "Player"
url = "http://maven.ic2.player.to/"
}
maven {
url = "http://dl.tsr.me/artifactory/libs-release-local"
}
maven {
url = "http://coloredlightscore.us.to/maven/chisel-2-dev/"
}
}

dependencies {
// you may put jars on which you depend on in ./libs
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"

// 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

// for more info...
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
// http://www.gradle.org/docs/current/userguide/dependency_management.html

compile files("libs/Ex-Nihilo-1.36.jar")
//compile files("libs/MineFactoryReloaded-[1.7.10]2.8.0RC3-591.jar")
compile files("libs/TConstruct_mc1.7.10_1.6.0d40.1.jar")
compile files("libs/Thaumcraft-1.7.10-4.2.0.1.jar")
compile files("libs/ThermalFoundation-[1.7.10]1.0.0B3-8.jar")
compile files("libs/TSteelworks-1.7.10-1.0.4.jar")
compile files("libs/Waila-1.5.3a_1.7.10.jar")
compile files("libs/RedstoneArsenal-[1.7.10]1.1.0B4-10.jar")
compile files("libs/Blood Magic-v1.1.0(1.7.10).jar")
compile name: 'CoFHLib', version: "${cofhlib_version}", ext: 'jar'
compile name: 'CoFHCore', version: "${cofhcore_version}", ext: 'jar'
compile name: 'RedstoneArsenal', version: "${rars_version}", ext: 'jar'
compile name: 'ThermalExpansion', version: "${texpansion_version}", ext: 'jar'
compile name: 'ThermalFoundation', version: "${tfoundation_version}", ext: 'jar'
compile name: 'BloodMagic', version: "${bloodmagic_version}", ext: 'jar'
compile name: 'Draconic-Evolution', version: "1.7.10-v1.0.1-snapshot_3", ext: 'jar'
compile name: 'witchery', version: "1.7.10-0.24.1", ext: 'jar'
compile "com.teammetallurgy:Metallurgy:1.7.10-4.0.6.80:deobf"
compile "com.teammetallurgy:MetallurgyCore:1.7.10-4.0.4.18:deobf"
compile "exnihilo:Ex-Nihilo:1.38-32:deobf"
compile "com.cricketcraft.chisel:Chisel2:2.3.7.85:deobf"

compile "nf.fr.ephys.cookiecore:CookieCore:1.7.10-1.3.1-5:deobf"
compile "nf.fr.ephys.tsteelworks:TSteelworks:1.7.10-1.1.0-6:deobf"
compile "tconstruct:TConstruct:1.7.10-1.8.2.build876:deobf"
compile "mcp.mobius.waila:Waila:1.5.8a_1.7.10:dev"
compile "codechicken:CodeChickenCore:1.7.10-1.0.4.35:dev"

compile fileTree(dir: 'libs', include: ['*.jar', '*.zip'])
}

processResources
@@ -72,3 +146,36 @@ processResources
exclude 'mcmod.info'
}
}

task sourceJar(type: Jar) {
from sourceSets.main.allSource
classifier = 'sources'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
from javadoc.destinationDir
classifier = 'javadoc'
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}

publishing {
tasks.publish.dependsOn 'build'
publications {
mavenJava(MavenPublication) {
artifact jar

artifact sourceJar
artifact deobfJar
}
}

repositories {
if (project.hasProperty('mavendir')) {
maven { url mavendir }
}
}
}
11 changes: 11 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cofhlib_version=[1.7.10]1.0.0RC7-142-dev
cofhcore_version=[1.7.10]3.0.0RC7-240-dev
rars_version=[1.7.10]1.1.0RC7-72-dev
texpansion_version=[1.7.10]4.0.0RC7-164-dev
tfoundation_version=[1.7.10]1.0.0RC7-72-dev
bloodmagic_version=1.7.10-1.3.0-1
metallurgy_version=1.7.10-4.0.6.80
metallurgycore_version=1.7.10-4.0.4.18
minecraft_version=1.7.10
forge_version=10.13.2.1236
mod_version=1.16
Binary file not shown.
Binary file added src/api/java/toops/tsteelworks/TSteelworks.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/toops/tsteelworks/lib/ModsData.class
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/toops/tsteelworks/lib/TSRepo.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/BotaniaAPI.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/brew/Brew.class
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/brew/IBrewItem.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/mana/ILens.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/mana/IManaItem.class
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/mana/IManaPool.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/package-info.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/wand/IWandHUD.class
Binary file not shown.
Binary file added src/api/java/vazkii/botania/api/wand/IWandable.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 2 additions & 4 deletions src/main/java/ExAstris/Block/BlockBarrelThaumium.java
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ public class BlockBarrelThaumium extends BlockContainer

public BlockBarrelThaumium() {
super(Material.rock);
setCreativeTab(CreativeTabs.tabDecorations);
setCreativeTab(ExAstris.ExAstris.ExAstrisTab);
setHardness(4.0f);
setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 1.0F, 0.9F);

@@ -80,8 +80,6 @@ public TileEntity createNewTileEntity(World world, int meta) {
public void onBlockAdded(World world, int x, int y, int z)
{
super.onBlockAdded(world, x, y, z);

int meta = world.getBlockMetadata(x, y, z);
}

@Override
@@ -274,7 +272,7 @@ else if(FluidContainerRegistry.isContainer(item))

}

if(ExAstris.Data.ModData.ALLOW_BEE_TRAP_INFUSED && item.getItem() == Item.getItemFromBlock(ENBlocks.BeeTrap))
if(ExAstris.Data.ModData.allowBeeTrapInfused && item.getItem() == Item.getItemFromBlock(ENBlocks.BeeTrap))
{
barrel.setMode(BarrelMode.BEEINFUSED);
barrel.resetColor();
4 changes: 1 addition & 3 deletions src/main/java/ExAstris/Block/BlockBeeTrapInfused.java
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.IIcon;


@@ -17,10 +16,9 @@ public class BlockBeeTrapInfused extends Block{

public BlockBeeTrapInfused() {
super(Material.ground);

setHardness(0.8f);
setStepSound(soundTypeGrass);
setCreativeTab(CreativeTabs.tabBlock);
setCreativeTab(ExAstris.ExAstris.ExAstrisTab);
}

@Override
4 changes: 2 additions & 2 deletions src/main/java/ExAstris/Block/BlockEndCake.java
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@@ -24,6 +23,7 @@ public class BlockEndCake extends BlockCake {
public BlockEndCake()
{
super();
setCreativeTab(ExAstris.ExAstris.ExAstrisTab);
}

@Override
@@ -90,7 +90,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p

private void nomEndCake(World world, int x, int y, int z, EntityPlayer player)
{
if (player.canEat(false))
if (player.canEat(false) || ModData.allowEndCakeEatingWhileFull)
{
int l = world.getBlockMetadata(x, y, z) + 1;

Loading