Update to 1.12.2

This commit is contained in:
mezz committed 2017-09-19 21:51:24 -07:00
1 parent 4689fef8c3
commit de6028e85d
12 files changed
+31 -14

No files matched your search

@@ -26,7 +26,7 @@ import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
@Mod(
modid = Constants.BOTANY_MOD_ID,
name = "Binnie's Botany",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
+ "after:" + Constants.GENETICS_MOD_ID + ";"
+ "after:" + Constants.DESIGN_MOD_ID + ";"
@@ -324,6 +324,11 @@ public class GardenLogic extends FarmLogic {
.filter(Objects::nonNull).collect(Collectors.toList());
}
@Override
public void addSoil(ItemStack resource, IBlockState soilState, boolean hasMetaData) {
// all {@link IBlockSoil} are soil, and nothing else
}
@Override
public ResourceLocation getTextureMap() {
return TextureMap.LOCATION_BLOCKS_TEXTURE;
@@ -90,7 +90,7 @@ public class ItemTrowel extends Item implements IItemModelRegister {
Multimap<String, AttributeModifier> multimap = super.getItemAttributeModifiers(equipmentSlot);
if (equipmentSlot == EntityEquipmentSlot.MAINHAND) {
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getDamageVsEntity() + 0.5, 0));
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Tool modifier", theToolMaterial.getAttackDamage() + 0.5, 0));
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Tool modifier", -1.5, 0));
}
@@ -57,7 +57,7 @@ import binnie.core.modules.ModuleManager;
modid = Constants.CORE_MOD_ID,
name = "Binnie Core",
version = "@VERSION@",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:forge@[13.20.0.2279,);" +
"required-after:forestry@[5.5.0.176,);" +
"after:jei@[4.7.8,);"
@@ -10,5 +10,7 @@ public final class Constants {
public static final String EXTRA_TREES_MOD_ID = "extratrees";
public static final String GENETICS_MOD_ID = "genetics";
public static final String ACCEPTED_MINECRAFT_VERSIONS = "[1.12,1.12.2]";
public static final float SPAWN_KOEF = 1365.3999f;
}
@@ -40,6 +40,7 @@ public class AABBModelBaker implements IModelBaker {
protected final FaceBakery faceBakery = new FaceBakery();
private final List<BoundModelBakerFace> faces = new ArrayList<>();
private final List<Pair<IBlockState, IBakedModel>> bakedModels = new ArrayList<>();
private final List<Pair<IBlockState, IBakedModel>> bakedModelsPost = new ArrayList<>();
protected AxisAlignedBB modelBounds;
protected final ModelBakerModel currentModel = new ModelBakerModel(ModelManager.getInstance().getDefaultBlockState());
protected int colorIndex = -1;
@@ -106,6 +107,11 @@ public class AABBModelBaker implements IModelBaker {
}
}
@Override
public void addBakedModelPost(@Nullable IBlockState state, IBakedModel model) {
this.bakedModelsPost.add(Pair.of(state, model));
}
protected float[] getFaceUvs(EnumFacing face, Vector3f to, Vector3f from) {
float minU;
float minV;
@@ -205,6 +211,10 @@ public class AABBModelBaker implements IModelBaker {
currentModel.addModelQuads(bakedModel);
}
for (Pair<IBlockState, IBakedModel> bakedModel : bakedModelsPost) {
currentModel.addModelQuadsPost(bakedModel);
}
for (BoundModelBakerFace face : faces) {
final AxisAlignedBB modelBounds = face.modelBounds;
final Vector3f from = new Vector3f((float) modelBounds.minX * 16.0f, (float) modelBounds.minY * 16.0f, (float) modelBounds.minZ * 16.0f);
@@ -215,7 +215,7 @@ public class ModelManager implements IModelManager {
}
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
public int colorMultiplier(ItemStack stack, int tintIndex) {
Item item = stack.getItem();
if (item instanceof IColoredItem) {
return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex);
@@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(
modid = Constants.DESIGN_MOD_ID,
name = "Binnie's Design",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
)
public class Design {
@@ -61,7 +61,7 @@ import binnie.genetics.api.GeneticsApi;
@Mod(
modid = ExtraBees.MODID,
name = "Binnie's Extra Bees",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:" + Constants.CORE_MOD_ID
)
public class ExtraBees {
@@ -32,7 +32,7 @@ import binnie.extratrees.proxy.Proxy;
@Mod(
modid = Constants.EXTRA_TREES_MOD_ID,
name = "Binnie's Extra Trees",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:" + Constants.CORE_MOD_ID + ";"
+ "after:" + Constants.DESIGN_MOD_ID + ";"
)
@@ -40,7 +40,7 @@ import binnie.genetics.proxy.Proxy;
@Mod(
modid = Constants.GENETICS_MOD_ID,
name = "Binnie's Genetics",
acceptedMinecraftVersions = "[1.12, 1.12.1]",
acceptedMinecraftVersions = Constants.ACCEPTED_MINECRAFT_VERSIONS,
dependencies = "required-after:" + Constants.CORE_MOD_ID
)
public class Genetics extends AbstractMod {
+6 -6
View File
@@ -3,18 +3,18 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
mcversion=1.12.1
forgeversion=14.22.0.2462
mcp_mappings=snapshot_20170826
mcversion=1.12.2
forgeversion=14.23.0.2486
mcp_mappings=snapshot_20170918
curse_project_id=223525
forestry_version=5.5.0.176
forestry_mcversion=1.12.1
forestry_version=5.5.6.197
forestry_mcversion=1.12.2
ic2_version=2.8.17-ex112
version_major=2
version_minor=3
version_patch=0
version_patch=1
jei_version=4.7.8.91
jei_mcversion=1.12.1