Commit c5bf5303 authored by ddb174's avatar ddb174

Drizzle25! Also includes a .exe launcher intended for when 26 is released...

Drizzle25!  Also includes a .exe launcher intended for when 26 is released through UAM.  It just acts the same as the .bat file.

git-svn-id: https://alcugs.almlys.org/svn/drizzle@2625 6ad0db0f-5bf4-0310-8fb6-eb40c444d375
parent e70d8cb5
java -Xmx800m -jar DrizzlePrp.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
\ No newline at end of file
java -Xmx800m -jar DrizzlePrp.jar %*
\ No newline at end of file
File added
<launch4jConfig>
<dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType>
<jar>.\Drizzle.jar</jar>
<outfile>C:\Documents and Settings\user\Desktop\drizzle\Drizzle.exe</outfile>
<errTitle></errTitle>
<cmdLine></cmdLine>
<chdir></chdir>
<priority>normal</priority>
<downloadUrl>http://java.com/download</downloadUrl>
<supportUrl></supportUrl>
<customProcName>true</customProcName>
<stayAlive>false</stayAlive>
<manifest></manifest>
<icon>C:\Documents and Settings\user\Desktop\drizzle\DrizzlePrp\src\gui\Pterosaur2b4-opaque.ico</icon>
<jre>
<path></path>
<minVersion>1.6.0</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<opt>-Xmx800m</opt>
</jre>
</launch4jConfig>
\ No newline at end of file
......@@ -6,12 +6,15 @@
package auto;
import auto.conversion;
import prpobjects.*;
import shared.m;
import java.util.Vector;
import auto.AllGames;
public class magiquest
{
//Intended for mqo 1.1399
//todo
//avi files
//new avatar animations?
......@@ -38,17 +41,77 @@ public class magiquest
"Courtyard.age","Courtyard.fni","Courtyard.sum","Courtyard_District_Courtyard.prp","Courtyard_District_CRTRedoGUI.prp","Courtyard_District_MQQuestInterface.prp","Courtyard_District_QuestItems.prp","Courtyard_District_Textures.prp",
});
r.addAgeFiles("Forest", new String[]{
"Forest.age","Forest.fni","Forest.sum","Forest_District_BattleGUI.prp","Forest_District_Forest.prp","Forest_District_FORRedoGUI.prp","Forest_District_HintGUI.prp","Forest_District_QuestItems.prp","Forest_District_Textures.prp","Forest_District_Windmill.prp",
"Forest.age","Forest.fni","Forest.sum","Forest_District_BattleGUI.prp","Forest_District_Forest.prp","Forest_District_FORRedoGUI.prp","Forest_District_HintGUI.prp","Forest_District_QuestItems.prp","Forest_District_Textures.prp","Forest_District_ViewHintGUI.prp","Forest_District_Windmill.prp",
});
r.addAgeFiles("PortalWell", new String[]{
"PortalWell.age","PortalWell.fni","PortalWell.sum","PortalWell_District_PortalWell.prp","PortalWell_District_Textures.prp",
});
r.MusicFiles = new String[]{
//certain:
"crtCourtyardMusic_01.ogg","crtCourtyardMusic_02.ogg","crtCourtyardMusic_03.ogg",
"ForestDark.ogg", "ForestIntro.ogg",
//maybe:
"BattleFightTemp.ogg", "BattleWinTemp.ogg", //a little cheesy, and probably not meant for the final game^^
//no:
//"prtPortalWellAmb_Loop01.ogg", //not really music
};
r.addSoundFiles(new String[]{
//courtyard:
"BirdFlaps01.ogg","BirdFlaps02.ogg","BirdRandom01.ogg","BirdRandom02.ogg","BirdRandom03.ogg","BirdRandom04.ogg","BirdRandom05.ogg","BirdRandom06.ogg",
"Random_Buzz01.ogg","Random_Buzz02.ogg","Random_Buzz03.ogg",
"CourtyardAmbience02.ogg","crtCourtyardMusic_01.ogg","crtCourtyardMusic_02.ogg","crtCourtyardMusic_03.ogg","crtNightCourtLoop.ogg","crtOuterAmb.ogg",
//"crtLokariNag.ogg","crtMajesticMorph_Backstory.ogg","crtMajesticMorph_Default1.ogg","crtMajesticMorph_Failure.ogg","crtMajesticMorph_Success.ogg","crtShadowMorph_Backstory.ogg","crtShadowMorph_Default1.ogg","crtShadowMorph_Default2.ogg","crtShadowMorph_Failure.ogg","crtShadowMorph_Success.ogg","crtTricksterMorph_Backstory.ogg","crtTricksterMorph_Default1.ogg","crtTricksterMorph_Failure.ogg","crtTricksterMorph_Success.ogg","crtWarriorMorph_Backstory.ogg","crtWarriorMorph_Default1.ogg","crtWarriorMorph_Default2.ogg","crtWarriorMorph_Failure.ogg","crtWarriorMorph_Success.ogg","crtWillowMorph_Backstory.ogg","crtWillowMorph_Default1.ogg","crtWillowMorph_Default2.ogg",
//"TutorialCourtyard_nag.ogg",
//forest:
//no sounds from Forest Age.
"BattleFightTemp.ogg","BattleWinTemp.ogg",
"ForestDark.ogg","ForestIntro.ogg",
"forAmbDark.ogg","forAmbLight.ogg",
"forBigGearMove.ogg","forBoulderCast.ogg",
"forCastleDoorClose.ogg","forCastleDoorOpen.ogg",
"forGearCollide.ogg","forGearGrind.ogg","forGearPower01.ogg","forGearPower02.ogg","forGearPower03.ogg",
//"forGolemRandom01.ogg","forGolemRandom02.ogg","forGolemRandom03.ogg","forGolemRandom04.ogg","forGolemRandom05.ogg","forGolemRandom06.ogg","forGolem_Vox_01.ogg","forGolem_Vox_02.ogg","forGolem_Vox_03.ogg","forGolem_Vox_04.ogg","forGolem_Vox_05.ogg",
//"forHelpGlow.ogg",
//"forIce-Break.ogg","forIce-Return.ogg",
"forLanternClick.ogg","forLanternLoop.ogg",
"forLever.ogg",
"forLittleGearMove.ogg","forMainGears.ogg",
//"forPixie-Default.ogg","forPixie-Failure.ogg","forPixie-Success.ogg",
"forPixieWingSFX.ogg",
//"forQuestStone-AlreadyComplete","forQuestStone-NeedToFinishQuest.ogg","forQuestStone-NotReady01.ogg","forQuestStone-NotReady02.ogg",
"forStream.ogg","forStreamLap.ogg","forWindmillHighLoop.ogg","forWindmillHighStart.ogg","forWindmillLowLoop.ogg","forWindmillLowStart.ogg","forWindmillSplineLoop.ogg",
//portalwell:
"prtPortalWellAmb_Loop01.ogg",
//"prtPortal-Fire.ogg","prtPortal-FireLoop.ogg","prtPortal-Open.ogg","prtPortal-Stone.ogg","prtPortal-Symbols.ogg","prtPortal-WordActivated.ogg","prtPortal-WordOpen.ogg",
//"Tutorial01.ogg","Tutorial01_Nag.ogg","Tutorial02.ogg","Tutorial02_Nag.ogg","Tutorial03.ogg","Tutorial03_Nag.ogg","Tutorial04.ogg","Tutorial04_Nag.ogg","Tutorial05.ogg","Tutorial05_Nag.ogg","Tutorial06.ogg","Tutorial06_Nag.ogg","Tutorial07.ogg","Tutorial07_nag.ogg","Tutorial08.ogg",
//global
//"xBattleGUISelect.ogg","xPortalOpenQuick.ogg","xQuestStoneGUISelect.ogg",
//"xWandable-Cloud.ogg","xWandable-Crystal.ogg","xWandable-FairyRing.ogg","xWandable-FireOrb.ogg","xWandable-FloatStone.ogg","xWandable-Flower.ogg","xWandable-GoldChest-FAIL.ogg","xWandable-GoldChest.ogg","xWandable-Rune.ogg","xWandable-Torch.ogg",
});
r.addAviFiles(new String[]{
//"Warrior over Color Loop wAlpha E52.bik","Trixter over Color Loop wAlpha E52.bik","Woodsy over Color Loop wAlpha E52.bik","Shadow over Color Loop wAlpha E52.bik","Magestic over Color Loop wAlpha E52.bik", //just glowing orbs
//"QM Dragon Intro 512.bik", //old intro to another quest?
"LITW Magma Rune Default 512sq.bik","PixieOnline_notglowing.bik","Moriki Default.bik","OnlineOwl_DefaultClip.bik",
});
r.decider = new prpobjects.prputils.Compiler.Decider() {
public boolean isObjectToBeIncluded(Uruobjectdesc desc) {
Typeid type = desc.objecttype;
if(type==Typeid.plCloneSpawnModifier) return false; //apparently Pots has a broken implementation of this class.
return true;
}
};
return r;
}
public static void convertMagiquest(String infolder, String outfolder)
{
AllGames.GameConversionSub _mqo = new AllGames.GameConversionSub(magiquest.getGameInfo());
_mqo.ConvertGame(infolder, outfolder);
//public static void convertMagiquest(String infolder, String outfolder)
//{
// AllGames.GameConversionSub _mqo = new AllGames.GameConversionSub(magiquest.getGameInfo());
// _mqo.ConvertGame(infolder, outfolder);
/*m.state.push();
m.state.curstate.showConsoleMessages = true;
m.state.curstate.showErrorMessages = true;
......@@ -87,7 +150,7 @@ public class magiquest
//m.status("Dont forget to run SoundDecompress.exe; the button is at UAM->SoundDecompress. (If SoundDecompress crashes, it means you have to log into Uru, quit, then try again.)");
m.status("Conversion completed!");
*/
}
//}
/*static String[] magiquestSimplicityFiles = new String[]{
"Courtyard.age","Courtyard.fni","Courtyard.sum","Courtyard_District_Courtyard.prp","Courtyard_District_QuestItems.prp","Courtyard_District_Textures.prp",
......@@ -97,14 +160,14 @@ public class magiquest
"PortalWell.age","PortalWell.fni","PortalWell.sum","PortalWell_District_PortalWell.prp","PortalWell_District_Textures.prp",
};*/
static String[] magiquestSoundFiles = new String[]{
/*static String[] magiquestSoundFiles = new String[]{
//courtyard:
"BirdFlaps01.ogg","BirdFlaps02.ogg","BirdRandom01.ogg","BirdRandom02.ogg","BirdRandom03.ogg","BirdRandom04.ogg","BirdRandom05.ogg","BirdRandom06.ogg","CourtyardAmbience02.ogg","crtCourtyardMusic_01.ogg","crtCourtyardMusic_02.ogg","crtCourtyardMusic_03.ogg","Random_Buzz01.ogg","Random_Buzz02.ogg","Random_Buzz03.ogg","Stream_Loop.ogg",
//forest:
//no sounds from Forest Age.
//portalwell:
"prtPortalWellAmb_Loop01.ogg","Tutorial01.ogg","Tutorial01_Nag.ogg","Tutorial02.ogg","Tutorial02_Nag.ogg","Tutorial03.ogg","Tutorial03_Nag.ogg","Tutorial04.ogg","Tutorial04_Nag.ogg","Tutorial05.ogg","Tutorial05_Nag.ogg","Tutorial06.ogg","Tutorial06_Nag.ogg","Tutorial07.ogg","Tutorial08.ogg",
};
};*/
/*public static void convertMagiquestToPots(String infolder, String outfolder)
{
......
......@@ -1096,6 +1096,65 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JLabel" name="jLabel78">
<Properties>
<Property name="text" type="java.lang.String" value="Magiquest folder:"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="20" y="300" width="140" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="shared.State.TextfieldState" name="textfieldState70">
<Properties>
<Property name="name" type="java.lang.String" value="mqosimp" noResource="true"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="170" y="300" width="400" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="jButton169">
<Properties>
<Property name="text" type="java.lang.String" value="select..."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton169ActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="570" y="290" width="110" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="jButton170">
<Properties>
<Property name="text" type="java.lang.String" value="Magiquest music..."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton170ActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="790" y="290" width="170" height="-1"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="jButton171">
<Properties>
<Property name="text" type="java.lang.String" value="Start..."/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton171ActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="710" y="290" width="90" height="-1"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="MemTab">
......@@ -1621,7 +1680,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="30" y="150" width="910" height="210"/>
<AbsoluteConstraints x="30" y="150" width="930" height="210"/>
</Constraint>
</Constraints>
......@@ -1721,7 +1780,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="540" y="20" width="320" height="60"/>
<AbsoluteConstraints x="660" y="20" width="250" height="60"/>
</Constraint>
</Constraints>
......@@ -1730,8 +1789,8 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="checkboxState32" min="-2" pref="190" max="-2" attributes="0"/>
<EmptySpace pref="112" max="32767" attributes="0"/>
<Component id="checkboxState32" pref="226" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
......@@ -3178,6 +3237,19 @@
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="jButton172">
<Properties>
<Property name="text" type="java.lang.String" value="Merge this Jar with Libs"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton172ActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
<AbsoluteConstraints x="330" y="370" width="200" height="-1"/>
</Constraint>
</Constraints>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
......
......@@ -42,6 +42,7 @@ import prpobjects.Typeid;
import shared.Bytes;
import java.util.Vector;
import shared.GuiUtils;
import shared.*;
/**
*
......@@ -56,8 +57,11 @@ public class Gui extends javax.swing.JFrame {
//String pots;
//String out;
public String settingsfile;
//public String readsettingsfile;
//public String writesettingsfile;
Settings settings = new Settings();
//boolean dosavesettings = false;
public static final String settingsfilename = ".drizzlesettings.canbedeleted.dat";
deepview.deepview deep;
public final shared.State.TabsState tabs;
......@@ -65,8 +69,9 @@ public class Gui extends javax.swing.JFrame {
/** Creates new form Gui */
public Gui()
{
Main.guiform = this;
shared.translation.enable("/gui/");
settingsfile = FileUtils.GetPresentWorkingDirectory()+"drizzlesettings.canbedeleted.dat";
settingsfile = FileUtils.GetPresentWorkingDirectory()+"/"+settingsfilename; //+"drizzlesettings.canbedeleted.dat";
initComponents();
int maxwidth = 1024; int maxheight = 740; //don't change these.
//int width = 1016; int height = 732; //border of 4
......@@ -79,6 +84,8 @@ public class Gui extends javax.swing.JFrame {
this.setTitle("Drizzle "+Integer.toString(Version.version));
shared.translation.registerGUIForm(this);
tabs = this.tabsState3;
Plugins.initialiseGui();
gui.UamGui.guiform = this;
gui.UamGui.agelist = this.jList1;
......@@ -90,7 +97,6 @@ public class Gui extends javax.swing.JFrame {
gui.UamGui.AgeLabel = this.ageInfo3;
gui.UamGui.startup = this.uamStartupButtongroup;
gui.UamGui.init();
tabs = this.tabsState3;
//set icon:
java.awt.Image img = shared.GetResource.getResourceAsImage("/gui/Pterosaur2b4-16.png");
......@@ -338,6 +344,9 @@ public class Gui extends javax.swing.JFrame {
SetBackgroundColour(true);
//initialise plugins
Plugins.initialiseGui2();
}
void pushlanguage(boolean silent)
{
......@@ -506,6 +515,11 @@ public class Gui extends javax.swing.JFrame {
jButton100 = new javax.swing.JButton();
jButton98 = new javax.swing.JButton();
jButton160 = new javax.swing.JButton();
jLabel78 = new javax.swing.JLabel();
textfieldState70 = new shared.State.TextfieldState();
jButton169 = new javax.swing.JButton();
jButton170 = new javax.swing.JButton();
jButton171 = new javax.swing.JButton();
MemTab = new javax.swing.JPanel();
textfieldState36 = new shared.State.TextfieldState();
jButton121 = new javax.swing.JButton();
......@@ -654,6 +668,7 @@ public class Gui extends javax.swing.JFrame {
jButton158 = new javax.swing.JButton();
textfieldState65 = new shared.State.TextfieldState();
jButton161 = new javax.swing.JButton();
jButton172 = new javax.swing.JButton();
jPanel3 = new javax.swing.JPanel();
jButton5 = new javax.swing.JButton();
jButton4 = new javax.swing.JButton();
......@@ -1438,6 +1453,41 @@ public class Gui extends javax.swing.JFrame {
SimpTab.add(jButton160);
jButton160.setBounds(710, 60, 90, 36);
jLabel78.setText("Magiquest folder:");
SimpTab.add(jLabel78);
jLabel78.setBounds(20, 300, 140, 16);
textfieldState70.setName("mqosimp"); // NOI18N
SimpTab.add(textfieldState70);
textfieldState70.setBounds(170, 300, 400, 20);
jButton169.setText("select...");
jButton169.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton169ActionPerformed(evt);
}
});
SimpTab.add(jButton169);
jButton169.setBounds(570, 290, 110, 36);
jButton170.setText("Magiquest music...");
jButton170.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton170ActionPerformed(evt);
}
});
SimpTab.add(jButton170);
jButton170.setBounds(790, 290, 170, 36);
jButton171.setText("Start...");
jButton171.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton171ActionPerformed(evt);
}
});
SimpTab.add(jButton171);
jButton171.setBounds(710, 290, 90, 36);
tabsState3.addTab("Conversion(Simplicity)", SimpTab);
textfieldState36.setName("vaultInFolder"); // NOI18N
......@@ -1787,8 +1837,8 @@ public class Gui extends javax.swing.JFrame {
jPanel38Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel38Layout.createSequentialGroup()
.addContainerGap()
.addComponent(checkboxState32, javax.swing.GroupLayout.PREFERRED_SIZE, 190, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(112, Short.MAX_VALUE))
.addComponent(checkboxState32, javax.swing.GroupLayout.DEFAULT_SIZE, 226, Short.MAX_VALUE)
.addContainerGap())
);
jPanel38Layout.setVerticalGroup(
jPanel38Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
......@@ -1798,10 +1848,10 @@ public class Gui extends javax.swing.JFrame {
);
jPanel34.add(jPanel38);
jPanel38.setBounds(540, 20, 320, 60);
jPanel38.setBounds(660, 20, 250, 60);
TheArtTab.add(jPanel34);
jPanel34.setBounds(30, 150, 910, 210);
jPanel34.setBounds(30, 150, 930, 210);
jLabel76.setForeground(new java.awt.Color(0, 102, 102));
jLabel76.setText("This area is for things related to the writing of Ages.");
......@@ -2598,6 +2648,15 @@ public class Gui extends javax.swing.JFrame {
jPanel49.add(jButton161);
jButton161.setBounds(340, 340, 210, 36);
jButton172.setText("Merge this Jar with Libs");
jButton172.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton172ActionPerformed(evt);
}
});
jPanel49.add(jButton172);
jButton172.setBounds(330, 370, 200, 36);
AdvTabState.addTab("Misc", jPanel49);
jButton5.setText("Decrypt notthedroids");
......@@ -5874,6 +5933,22 @@ private void jButton168ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
private void jButton167ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton167ActionPerformed
m.msg(auto.Game.getAllGamenames());
}//GEN-LAST:event_jButton167ActionPerformed
private void jButton169ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton169ActionPerformed
GuiUtils.getUserSelectedFolder(textfieldState70);
}//GEN-LAST:event_jButton169ActionPerformed
private void jButton170ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton170ActionPerformed
ThreadedTasks.copyMagiquestMusic(textfieldState70.getText(), textfieldState34.getText());
}//GEN-LAST:event_jButton170ActionPerformed
private void jButton171ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton171ActionPerformed
ThreadedTasks.convertMagiquest(textfieldState70.getText(), textfieldState34.getText());
}//GEN-LAST:event_jButton171ActionPerformed
private void jButton172ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton172ActionPerformed
JarUtils.MergeThisJarWithLibs();
}//GEN-LAST:event_jButton172ActionPerformed
/*class c2 extends javax.swing.DefaultListSelectionModel
{
......@@ -6038,7 +6113,11 @@ private void jButton167ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
private javax.swing.JButton jButton166;
private javax.swing.JButton jButton167;
private javax.swing.JButton jButton168;
private javax.swing.JButton jButton169;
private javax.swing.JButton jButton17;
private javax.swing.JButton jButton170;
private javax.swing.JButton jButton171;
private javax.swing.JButton jButton172;
private javax.swing.JButton jButton18;
private javax.swing.JButton jButton19;
private javax.swing.JButton jButton2;
......@@ -6205,6 +6284,7 @@ private void jButton167ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
private javax.swing.JLabel jLabel75;
private javax.swing.JLabel jLabel76;
private javax.swing.JLabel jLabel77;
private javax.swing.JLabel jLabel78;
private javax.swing.JLabel jLabel8;
private javax.swing.JLabel jLabel9;
private javax.swing.JList jList1;
......@@ -6363,6 +6443,7 @@ private void jButton167ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FI
private shared.State.TextfieldState textfieldState68;
private shared.State.TextfieldState textfieldState69;
private shared.State.TextfieldState textfieldState7;
private shared.State.TextfieldState textfieldState70;
private shared.State.TextfieldState textfieldState8;
private shared.State.TextfieldState textfieldState9;
private shared.State.ButtongroupState uamStartupButtongroup;
......
This diff is collapsed.
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package gui;
import shared.*;
import javax.swing.JPanel;
import java.util.Vector;
public class Plugins
{
//list of plugin classes to be initialised.
private static final String[] plugins = {
"drizzleadjunct.AdjPlugin",
};
private static Vector<JPanel> panels = new Vector<JPanel>();
private static String guititle = "";
private static Vector<Runnable> guicallbacks = new Vector<Runnable>();
public static void initialise()
{
for(String plugin: plugins)
{
try{
Class klass = Class.forName(plugin); //loads the class if it isn't already.
m.msg("Loaded plugin: ",plugin);
}catch(ClassNotFoundException e){
//plugin not loaded.
//m.msg("Unable to load plugin: ",plugin);
}
catch(Exception e){
m.msg("Unexpected exception while loading plugin: ",plugin);
}
}
}
public static void initialiseGui() //at start of Gui constructor
{
//do panels
for(JPanel panel: panels)
{
Main.guiform.tabs.addTab(panel.getName(), panel);
}
//do title
String newtitle = Main.guiform.getTitle() + guititle;
Main.guiform.setTitle(newtitle);
}
public static void initialiseGui2() //at end of Gui constructor
{
//do gui callbacks
for(Runnable r: guicallbacks)
{
r.run();
}
}
public static void addGuiPanel(JPanel panel, String panelname)
{
panel.setName(panelname);
panels.add(panel);
}
public static void appendTitle(String title)
{
guititle = guititle + " " + title;
}
public static void addGuiInitialisedCallback(Runnable r)
{
guicallbacks.add(r);
}
}
......@@ -53,6 +53,8 @@ public class ThreadedTasks
{
shared.GuiThread.run(getInfo(),new java.lang.Runnable() { public void run() {
gui.UamGui.PerformDownload();
//check if we've installed a new Drizzle, and if so, restart.
Main.PerformUpdate(new String[]{},uam.Uam.getPotsFolder()+"/Drizzle/",true);
}});
}
public static void uamDownloadAgeList(final String server, final String potsfolder)
......@@ -110,6 +112,13 @@ public class ThreadedTasks
}});
}
public static void convertMagiquest(final String infolder, final String potsfolder)
{
shared.GuiThread.run(getInfo(),new java.lang.Runnable() { public void run() {
auto.AllGames.getMqo().ConvertGame(infolder, potsfolder);
}});
}
public static void copyPotsMusic(final String infolder, final String outfolder)
{
shared.GuiThread.run(getInfo(),new java.lang.Runnable() { public void run() {
......@@ -145,6 +154,13 @@ public class ThreadedTasks
}});
}
public static void copyMagiquestMusic(final String infolder, final String outfolder)
{
shared.GuiThread.run(getInfo(),new java.lang.Runnable() { public void run() {
auto.AllGames.getMqo().CopyMusic(infolder, outfolder);
}});
}
public static void custom(final java.lang.Runnable command)
{
shared.GuiThread.run(getInfo(),new java.lang.Runnable() { public void run() {
......
......@@ -667,6 +667,9 @@ public class UamGui
}
uam.Uam.installInfo.printStatsMessage();
//check if we've installed a new Drizzle, and if so, restart.
}
public static void GetAgeListGuiOffline(String potsfolder)
{
......
......@@ -135,6 +135,9 @@ CommandLine{->}CommandLine
3dsmax->Pots{->}3dsmax->Pots
restStop4.bik{->}restStop4.bik
de{->}de
tab1{->}tab1
test{->}test
MagiQuestOnline{->}MagiQuestOnline
Warning: {->}Warnung:
......@@ -393,6 +396,19 @@ Done converting Age!: {->}Fertig mit Konvertieren des Zeitalters!:
Decompiling pyc file...{->}Dekompiliere pyc Datei...
List Gamenames{->}Spielenamen auflisten
//Drizzle25
Magiquest folder:{->}Magiquest Ordner:
Magiquest music...{->}Magiquest Musik...
Launch Uru after converting{->}Starte Uru nach der Konvertierung
Options{->}Einstellungen
Merge this Jar with Libs{->}Vereinige dieses Jar mit den Libs
OldLegacy{->}Altes Erbe
Error while updating Drizzle. It seems Drizzle.jar did not close.{->}Es ist ein Fehler beim Aktualisieren von Drizzle aufgetreten. Es scheint, als ob Drizzle.jar nicht geschlossen wurde.
Please make sure there are no other copies of Drizzle running, and hit OK to try again.{->}Bitte stelle sicher, dass keine anderen Versionen von Drizzle aktiv sind und drcke auf OK um es erneut zu versuchen.
Problem updating{->}Es gab ein Problem beim Aktualisieren.
Restarting to update Drizzle...{->}Starte Drizzle neu zum Aktualisieren...
Drizzle is about to restart, in order to update itself. You should use the Drizzle.exe (or less preferably, Drizzle.jar) file in the 'Drizzle' subfolder of Uru to start it. Please don't get confused and use copies elsewhere, and think they are updated; you can always see which version you're using at the top of Drizzle. And don't forget to have fun :D{->}Drizzle ist im Begriff neu zu starten um sich zu aktualisieren. Du solltest Drizzle.exe (oder, weniger wnschenswert, Drizzle.jar) im 'Drizzle'-Unterordner von Uru benutzen, um es zu starten. Bitte verwirre dich nicht und benutze andere Kopien woanders und denke, dass sie aktualisiert sind; du kannst immer am Namen erkennen, welche Version du gerade benutzt. Und vergiss nicht, viel Spa :D
You have a newer version of Drizzle installed. Perhaps you want to use that? It's located at: {->}Du hast eine neuere Version von Drizzle installiert. Vielleicht mchtest du diese benutzen? Sie befindet sich hier:
......
......@@ -3,3 +3,6 @@
Warning: {->}Warning:
Crowthistle{->}Crowthistle
Setting language to {->}Setting language to:
Recompilated completed!{->}Recompilation completed!
......@@ -226,3 +226,41 @@ Start DrizzleDeepview{->}D
Delete old archives...{->}Supprimer les anciennes archives...
Clear .sum files.{->}Vider les fichiers .sum
Version?{->}Version?
//Drizzle24
Convert{->}Convertir
3dsmax's output folder (set in PlasmaMax2.ini):{->}Dossier de sortie de 3dsmax (choisi dans PlasmaMax2.ini):
(The created files will be placed in the Pots folder given on the UAM tab.){->}(Les fichiers créés seront placés dans le dossier Pots choisi dans l'onglet UAM)
This area is for things related to the writing of Ages.{->}Cet emplacementest pour tout ce qui concerne la conception d'Ages.
Pyc or Pak file:{->}Fichier Pyc ou Pak:
Decompile{->}Décompiler
Unpack{->}Dépaqueter
Gamename(for a list, go to Misc->ListGamenames):{->}Nom du jeu (pour la liste, voir Misc/Liste des jeux):
The Art{->}L'Art
Unpacking pak file...{->}Dépaquetage du fichier pak...
Done unpacking!{->}Dépaquetage terminé.
Decompiling pak file...{->}Décompilation du fichier pak...
Done decompiling!{->}Décompilation terminée.
Converting Age: {->}Conversion de l'Age:
Unknown encryption type; assuming it is unencrypted.{->}Type de chiffrementinconnu, on assume que c'est en clair.
Converting Prp: {->}Conversion du Prp:
Process All was successful!{->}Processus terminé avec succès.
Recompilated completed!{->}Recompilation terminée.
Done converting Age!: {->}Conversion de l'Age terminée.
Decompiling pyc file...{->}Décompilation du fichier pyc...
List Gamenames{->}Liste des jeux
//Drizzle25
Magiquest folder:{->}Dossier Magiquest:
Magiquest music...{->}Musique de Magiquest
Launch Uru after converting{->}Lancer Uru après conversion
Options{->}Options
Merge this Jar with Libs{->}Fusionner Jar avec Libs
OldLegacy{->}Fonctions périmées
Error while updating Drizzle. It seems Drizzle.jar did not close.{->}Erreur lors de la mise à jour de Drizzle. Il semble que Drizzle.jar soit encore ouvert.
Please make sure there are no other copies of Drizzle running, and hit OK to try again.{->}Assurez-vous qu'aucune autre copie de Drizzle ne soit active, puis appuyez sur OK pour essayer de nouveau.
Problem updating{->}Problème de mise à jour
Restarting to update Drizzle...{->}Redémarrage de Drizzle pour la mise à jour...
Drizzle is about to restart, in order to update itself. You should use the Drizzle.exe (or less preferably, Drizzle.jar) file in the 'Drizzle' subfolder of Uru to start it. Please don't get confused and use copies elsewhere, and think they are updated; you can always see which version you're using at the top of Drizzle. And don't forget to have fun :D{->}Drizzle va redémarrer pour effectuer sa mise à jour. Il est préférable d'utiliser la copie de Drizzle.exe (ou à défaut, Drizzle.jar) située dans le sous-dossier "Drizzle" de Uru. L'utilisation d'une autre copie peut amenr une confusion quant à la version utilisée. Drizzle affiche toujours son numéro de version en haut de la fenêtre. Nous vous souhaitons bien du plaisir avec votre nouvelle version de Drizzle! :D
You have a newer version of Drizzle installed. Perhaps you want to use that? It's located at: {->}Vous avez une version plus récente de Drizzle, préférez-vous l'utiliser? Elle est située ici:
......@@ -254,5 +254,18 @@ Done converting Age!: {->}Omzetten wereld klaar!
Decompiling pyc file...{->}pyc file veranderen...
List Gamenames{->}Spellijst
//Drizzle25
Magiquest folder:{->}Magiquest map:
Magiquest music...{->}Magiquest muziek...