Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 24fb4cfe4a | |||
| 186138d0c0 | |||
| 6690564017 |
+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.5",
|
"1.12.2-latest": "4.3.6",
|
||||||
"1.12.2-recommended": "4.3.5"
|
"1.12.2-recommended": "4.3.6"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ assignees: ''
|
|||||||
Please read the [guide for contributing](https://github.com/Electroblob77/Wizardry/blob/1.12.2/CONTRIBUTING.md) before posting. You may also find the [troubleshooting page](https://github.com/Electroblob77/Wizardry/wiki/Troubleshooting) helpful.
|
Please read the [guide for contributing](https://github.com/Electroblob77/Wizardry/blob/1.12.2/CONTRIBUTING.md) before posting. You may also find the [troubleshooting page](https://github.com/Electroblob77/Wizardry/wiki/Troubleshooting) helpful.
|
||||||
|
|
||||||
Minecraft version: 1.12.2 [change as necessary]
|
Minecraft version: 1.12.2 [change as necessary]
|
||||||
Wizardry version: 4.3.5 [change as necessary]
|
Wizardry version: 4.3.6 [change as necessary]
|
||||||
Environment: Singleplayer/LAN game/Server [delete as necessary]
|
Environment: Singleplayer/LAN game/Server [delete as necessary]
|
||||||
|
|
||||||
Issue details: [describe what you were doing when the issue occurred, what went wrong, what you expected to happen, etc.]
|
Issue details: [describe what you were doing when the issue occurred, what went wrong, what you expected to happen, etc.]
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Credits
|
# Credits
|
||||||
|
|
||||||
Electroblob's Wizardry
|
Electroblob's Wizardry
|
||||||
Version 4.3.5
|
Version 4.3.6
|
||||||
For Minecraft 1.12.2
|
For Minecraft 1.12.2
|
||||||
|
|
||||||
Designed, coded and textured by Electroblob
|
Designed, coded and textured by Electroblob
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
|
|||||||
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
|
||||||
|
|
||||||
|
|
||||||
version = "4.3.5" // There, it matches semver, happy now?
|
version = "4.3.6" // There, it matches semver, happy now?
|
||||||
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"
|
||||||
|
|
||||||
|
|||||||
@@ -81,7 +81,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.5";
|
public static final String VERSION = "4.3.6";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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>.
|
||||||
|
|||||||
@@ -31,19 +31,19 @@ import net.minecraftforge.fml.common.eventhandler.Event;
|
|||||||
public class ImbuementActivateEvent extends Event {
|
public class ImbuementActivateEvent extends Event {
|
||||||
|
|
||||||
/** The item stack being imbued */
|
/** The item stack being imbued */
|
||||||
ItemStack input;
|
public ItemStack input;
|
||||||
|
|
||||||
/** The elements of the four receptacles */
|
/** The elements of the four receptacles */
|
||||||
Element[] receptacleElements;
|
public Element[] receptacleElements;
|
||||||
|
|
||||||
/** A reference to the current world object (may be null if {@code fullLootGen} is false) */
|
/** A reference to the current world object (may be null if {@code fullLootGen} is false) */
|
||||||
World world;
|
public World world;
|
||||||
|
|
||||||
/** The player that last interacted with the imbuement altar, or null if there isn't one (or if this is being queried for other reasons, e.g. JEI) */
|
/** The player that last interacted with the imbuement altar, or null if there isn't one (or if this is being queried for other reasons, e.g. JEI) */
|
||||||
EntityPlayer lastUser;
|
public EntityPlayer lastUser;
|
||||||
|
|
||||||
/** The resulting item stack of the imbuement process */
|
/** The resulting item stack of the imbuement process */
|
||||||
ItemStack result;
|
public ItemStack result;
|
||||||
|
|
||||||
public ImbuementActivateEvent(ItemStack input, Element[] receptacleElements, World world, EntityPlayer lastUser, ItemStack result) {
|
public ImbuementActivateEvent(ItemStack input, Element[] receptacleElements, World world, EntityPlayer lastUser, ItemStack result) {
|
||||||
super();
|
super();
|
||||||
|
|||||||
@@ -21,9 +21,13 @@ public class PacketSpellProperties implements IMessageHandler<PacketSpellPropert
|
|||||||
|
|
||||||
net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(() -> {
|
net.minecraft.client.Minecraft.getMinecraft().addScheduledTask(() -> {
|
||||||
|
|
||||||
int first = message.firstId;
|
int spellId = message.firstId;
|
||||||
for(int i = first; i <message.propertiesArray.length; i++){
|
|
||||||
Spell.byNetworkID(i).setPropertiesClient(message.propertiesArray[i]);
|
for(int i = 0; i <message.propertiesArray.length; i++){
|
||||||
|
Spell spell = Spell.byNetworkID(spellId);
|
||||||
|
SpellProperties props = message.propertiesArray[i];
|
||||||
|
spell.setPropertiesClient(props);
|
||||||
|
spellId++;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -43,16 +47,22 @@ public class PacketSpellProperties implements IMessageHandler<PacketSpellPropert
|
|||||||
this.firstId = firstId;
|
this.firstId = firstId;
|
||||||
this.count = count;
|
this.count = count;
|
||||||
this.propertiesArray = properties;
|
this.propertiesArray = properties;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void fromBytes(ByteBuf buf){
|
public void fromBytes(ByteBuf buf){
|
||||||
List<SpellProperties> propertiesList = new ArrayList<>();
|
List<SpellProperties> propertiesList = new ArrayList<>();
|
||||||
int i = buf.readInt();
|
firstId = buf.readInt();
|
||||||
count = buf.readInt();
|
count = buf.readInt();
|
||||||
firstId = i;
|
|
||||||
while(buf.isReadable() && i < count){
|
int k = 0;
|
||||||
propertiesList.add(new SpellProperties(Spell.byNetworkID(i++), buf));
|
int j = firstId;
|
||||||
|
while(k < count){
|
||||||
|
SpellProperties props = new SpellProperties(Spell.byNetworkID(j), buf);
|
||||||
|
propertiesList.add(props);
|
||||||
|
k++;
|
||||||
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
propertiesArray = propertiesList.toArray(new SpellProperties[0]);
|
propertiesArray = propertiesList.toArray(new SpellProperties[0]);
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
{
|
{
|
||||||
"modid" : "ebwizardry",
|
"modid" : "ebwizardry",
|
||||||
"name" : "Electroblob's Wizardry",
|
"name" : "Electroblob's Wizardry",
|
||||||
"version" : "4.3.5",
|
"version" : "4.3.6",
|
||||||
"mcversion" : "1.12.2",
|
"mcversion" : "1.12.2",
|
||||||
"url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry",
|
"url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry",
|
||||||
"credits" : "\nDesigned, coded and textured by Electroblob.\nDiscord Moderators: FavouriteDragon, WinDanesz\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica, UltraHex, Azim-Palmer, raoulvdberge, rafasoares, xinyuan-liu, SettingDust, Aralu115.\nTranslators: Alsentar (Spanish), MadWrist (Mexican Spanish), VilagVil, kellixon, bigenergy, MugGod2 & DrHesperus (Russian), Hahdrim & Crowller (French), lorrampi (Brazilian Portuguese), ZHENGLOC, dragon-evol, Hokorizero, TUsama & Determancer (Chinese - Simplified), shejery, rewi_wire, 방통 & red1854th (Korean), Trozuu & Olej (Polish), BirdyDragon & Lemopav (German), chesterccj305 (Chinese - Traditional), Bombadil (Hungarian).\nSound Effects: OhhWowProductions, fredzed, deleted_user_3277771, DiscoveryME, OGSoundFX, leosalom, juskiddink",
|
"credits" : "\nDesigned, coded and textured by Electroblob.\nDiscord Moderators: FavouriteDragon, WinDanesz\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica, UltraHex, Azim-Palmer, raoulvdberge, rafasoares, xinyuan-liu, SettingDust, Aralu115.\nTranslators: Alsentar (Spanish), MadWrist (Mexican Spanish), VilagVil, kellixon, bigenergy, MugGod2 & DrHesperus (Russian), Hahdrim & Crowller (French), lorrampi (Brazilian Portuguese), ZHENGLOC, dragon-evol, Hokorizero, TUsama & Determancer (Chinese - Simplified), shejery, rewi_wire, 방통 & red1854th (Korean), Trozuu & Olej (Polish), BirdyDragon & Lemopav (German), chesterccj305 (Chinese - Traditional), Bombadil (Hungarian).\nSound Effects: OhhWowProductions, fredzed, deleted_user_3277771, DiscoveryME, OGSoundFX, leosalom, juskiddink",
|
||||||
|
|||||||
Reference in New Issue
Block a user