mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
09fa488cff
16 files changed
+85
-154
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.alcohol;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
@@ -84,12 +85,12 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
|
||||
//TODO TEXTURE
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getStill() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.alcohol;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -74,12 +75,12 @@ public enum Juice implements IFluidType, ICocktailLiquid {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getStill() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.alcohol;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -74,12 +75,12 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getStill() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -44,16 +44,6 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid {
|
||||
return container == FluidContainer.Glass;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getIcon() {
|
||||
// return this.icon;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void registerIcon(final IIconRegister register) {
|
||||
// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid");
|
||||
// }
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.alcohol;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -65,24 +66,14 @@ public enum Spirit implements IFluidType, ICocktailLiquid {
|
||||
return container == FluidContainer.Glass;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public IIcon getIcon() {
|
||||
// return this.icon;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void registerIcon(final IIconRegister register) {
|
||||
// this.icon = ExtraTrees.proxy.getIcon(register, "liquids/liquid");
|
||||
// }
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getStill() {
|
||||
return new ResourceLocation("liquids/liquid");
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/liquid");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.ILiquidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -36,12 +37,12 @@ public enum ExtraTreeLiquid implements ILiquidType {
|
||||
|
||||
@Override
|
||||
public ResourceLocation getStill() {
|
||||
return new ResourceLocation("liquids/" + this.getIdentifier());
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier());
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowing() {
|
||||
return new ResourceLocation("liquids/" + this.getIdentifier());
|
||||
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, "liquids/" + this.getIdentifier());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user